From 7746bcd3283066a699a24281e2569f59372fa555 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 5 Dec 1995 07:06:28 +0000
Subject: [PATCH] Nothing

---
 ChangeLog   |  5 +++++
 Makefile.in | 10 +++++-----
 automake.in | 19 ++++++++++---------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8c42bda1..6b10b2ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Mon Dec  4 11:55:36 1995  Tom Tromey  <tromey@cambric.colorado.edu>
 
+	* automake.in (am_install_var): Push target onto @all.
+	(get_object_extension): Use $(...).
+	(handle_source_transform): Ditto.
+	(handle_programs): Ditto.
+
 	* automake.in (require_argument): New function.
 	(parse_arguments): Use it.
 	(push_dist_common): New function.
diff --git a/Makefile.in b/Makefile.in
index ad3d95d7..96664a29 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -64,7 +64,7 @@ DIST_OTHER = automake.in
 
 ETAGS_ARGS = automake.in
 
-SCRIPTS = ${bin_SCRIPTS}
+SCRIPTS = $(bin_SCRIPTS)
 
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
@@ -76,10 +76,10 @@ INFOS = automake.info*
 INFO_DEPS = automake.info
 DVIS = automake.dvi
 
-DATA = ${pkgdata_DATA}
+DATA = $(pkgdata_DATA)
 
 ACLOCAL = aclocal.m4
-DIST_COMMON = Makefile.in Makefile.am version.texi stamp-vti mdate-sh texinfo.tex aclocal.m4 install-sh mkinstalldirs THANKS TODO README NEWS INSTALL ChangeLog configure configure.in
+DIST_COMMON = mkinstalldirs configure Makefile.in stamp-vti configure.in ChangeLog THANKS README version.texi mdate-sh TODO INSTALL Makefile.am texinfo.tex NEWS aclocal.m4 install-sh
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -238,7 +238,7 @@ dist: $(DISTFILES)
 	tar -chozf $(distdir).tar.gz $(distdir)
 	rm -rf $(distdir)
 
-all: info
+all: info $(bin_SCRIPTS) $(pkgdata_DATA)
 
 info: $(INFO_DEPS)
 
@@ -257,7 +257,7 @@ install: install-exec install-data
 uninstall: uninstall-binSCRIPTS uninstall-info uninstall-pkgdataDATA
 
 installdirs:
-	$(top_srcdir)/mkinstalldirs ${bindir} $(infodir) ${pkgdatadir}
+	$(top_srcdir)/mkinstalldirs $(bindir) $(infodir) $(pkgdatadir)
 
 mostlyclean-generic:
 	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
diff --git a/automake.in b/automake.in
index 8aa3a08f..539d9835 100755
--- a/automake.in
+++ b/automake.in
@@ -35,7 +35,7 @@ $am_dir = "@datadir@/@PACKAGE@";
 
 
 # Constants to define the "strictness" level.
-$LENIENT = 0;
+$NORMAL = 0;
 $GNU = 1;
 $GNITS = 2;
 
@@ -288,7 +288,7 @@ sub get_object_extension
 
 	if (defined $contents{'@kr@'})
 	{
-	    $dir_holds_sources = '.${kr}o';
+	    $dir_holds_sources = '.$(kr)o';
 	    push (@suffixes, '._c', '._o');
 
 	    &require_file ($NORMAL, 'ansi2knr.c');
@@ -333,8 +333,8 @@ sub handle_source_transform
 	    &am_error ($one_file . '_OBJECTS', 'should not be defined');
 	}
 
-	@result = ('${' . $one_file . "_SOURCES}",
-		   '${' . $one_file . "_OBJECTS}");
+	@result = ('$(' . $one_file . "_SOURCES)",
+		   '$(' . $one_file . "_OBJECTS)");
     }
     else
     {
@@ -368,8 +368,8 @@ sub handle_programs
     local ($obj) = &get_object_extension;
 
     local (@sources, @objects);
-    push (@sources, '${SOURCES}') if (defined $contents{'SOURCES'});
-    push (@objects, '${OBJECTS}') if (defined $contents{'OBJECTS'});
+    push (@sources, '$(SOURCES)') if (defined $contents{'SOURCES'});
+    push (@objects, '$(OBJECTS)') if (defined $contents{'OBJECTS'});
 
     local ($one_file);
     local ($sadd, $oadd);
@@ -419,7 +419,7 @@ sub handle_programs
 	    if (! defined $contents{$one_file . "_LDADD"})
 	    {
 		# User didn't define prog_LDADD override.  So do it.
-		$output_vars .= $one_file . '_LDADD = ${LDADD}' . "\n";
+		$output_vars .= $one_file . '_LDADD = $(LDADD)' . "\n";
 	    }
 
 	    ($munge = $fcont) =~ s/\@PROGRAM\@/$one_file/g;
@@ -1300,7 +1300,8 @@ sub am_install_var
     {
 	if (defined $contents{$_ . '_' . $primary})
 	{
-	    push (@used, '${' . $_ . '_' . $primary . '}');
+	    push (@all, '$(' . $_ . '_' . $primary . ')');
+	    push (@used, '$(' . $_ . '_' . $primary . ')');
 	    if ($_ eq 'noinst')
 	    {
 		# Objects in noinst_FOO never get installed.
@@ -1311,7 +1312,7 @@ sub am_install_var
 	    $output_rules .= $munge;
 
 	    push (@uninstall, 'uninstall-' . $_ . $primary);
-	    push (@installdirs, '${' . $_ . 'dir}');
+	    push (@installdirs, '$(' . $_ . 'dir)');
 	    if ($exec_dir_p{$_})
 	    {
 		push (@install_exec, 'install-' . $_ . $primary);
-- 
2.43.5