bug fix

10 files changed, 35 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 60b360883..fe2e2af79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Dec  3 10:40:48 1996  Tom Tromey  <tromey@cygnus.com>
+
+	* progs.am: Use @LIBTOOL@, not $(LIBTOOL).
+
+	* automake.in (am_install_var): If -ltlibs passed, substitute
+	@LIBTOOL@.
+
 Mon Dec  2 12:13:27 1996  Tom Tromey  <tromey@cygnus.com>
 
 	* Released 1.1i.
diff --git a/Makefile.am b/Makefile.am
index 37fbe77f7..a1a9d8908 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,7 +82,9 @@ cvs-dist: maintainer-check distcheck
 
 cvs-diff:
 	thisver=`echo "Release-$(VERSION)" | sed 's/\./-/g'`; \
-	prevno=`echo "$(VERSION)" - 0.01 | bc | sed 's/^\./0./'`; \
+	if test -z "$$OLDVERSION"; then \
+	  prevno=`echo "$(VERSION)" - 0.01 | bc | sed 's/^\./0./'`; \
+	else prevno="$$OLDVERSION"; fi; \
 	prevver=Release-`echo $$prevno | sed 's/\./-/g'`; \
 	cvs -f rdiff -c -r $$prevver -r $$thisver $(PACKAGE) \
 	    > $(PACKAGE)-$$prevno-$(VERSION).diff
diff --git a/Makefile.in b/Makefile.in
index 19249ba31..1d0de4c8b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -484,7 +484,9 @@ cvs-dist: maintainer-check distcheck
 
 cvs-diff:
 	thisver=`echo "Release-$(VERSION)" | sed 's/\./-/g'`; \
-	prevno=`echo "$(VERSION)" - 0.01 | bc | sed 's/^\./0./'`; \
+	if test -z "$$OLDVERSION"; then \
+	  prevno=`echo "$(VERSION)" - 0.01 | bc | sed 's/^\./0./'`; \
+	else prevno="$$OLDVERSION"; fi; \
 	prevver=Release-`echo $$prevno | sed 's/\./-/g'`; \
 	cvs -f rdiff -c -r $$prevver -r $$thisver $(PACKAGE) \
 	    > $(PACKAGE)-$$prevno-$(VERSION).diff
diff --git a/automake.in b/automake.in
index 70a8f7e87..291d8f36d 100755
--- a/automake.in
+++ b/automake.in
@@ -4146,6 +4146,7 @@ sub am_install_var
     local (@args) = @_;
 
     local ($do_clean, $do_ltlibs) = (0, 0);
+    local ($more_xform) = '';
     while (@args)
     {
 	if ($args[0] eq '-clean')
@@ -4155,6 +4156,16 @@ sub am_install_var
 	if ($args[0] eq '-ltlibs')
 	{
 	    $do_ltlibs = 1;
+	    if ($seen_libtool)
+	    {
+		# Note that we explicitly set the mode, to avoid
+		# lossage if the program name isn't what we expect.
+		$more_xform = 's/\@LIBTOOL\@/$(LIBTOOL) --mode=install/;';
+	    }
+	    else
+	    {
+		$more_xform = 's/\@LIBTOOL\@//;';
+	    }
 	}
 	elsif ($args[0] !~ /^-/)
 	{
@@ -4295,7 +4306,8 @@ sub am_install_var
 	    else
 	    {
 		$output_rules .=
-		    &file_contents_with_transform ('s/\@DIR\@/' . $X . '/go',
+		    &file_contents_with_transform ('s/\@DIR\@/' . $X . '/g;'
+						   . $more_xform,
 						   $file);
 	    }
 
diff --git a/configure b/configure
index 077d42b1c..3d1e3d90a 100755
--- a/configure
+++ b/configure
@@ -608,7 +608,7 @@ cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
 
-VERSION=1.1i
+VERSION=1.1j
 
 cat >> confdefs.h <<EOF
 #define VERSION "$VERSION"
diff --git a/configure.in b/configure.in
index f3faff9bf..e02380bcd 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(automake.in)
 
-AM_INIT_AUTOMAKE(automake, 1.1i)
+AM_INIT_AUTOMAKE(automake, 1.1j)
 
 AC_PATH_PROG(PERL, perl)
 if test -z "$PERL"; then
diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 37fbe77f7..a1a9d8908 100644
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -82,7 +82,9 @@ cvs-dist: maintainer-check distcheck
 
 cvs-diff:
 	thisver=`echo "Release-$(VERSION)" | sed 's/\./-/g'`; \
-	prevno=`echo "$(VERSION)" - 0.01 | bc | sed 's/^\./0./'`; \
+	if test -z "$$OLDVERSION"; then \
+	  prevno=`echo "$(VERSION)" - 0.01 | bc | sed 's/^\./0./'`; \
+	else prevno="$$OLDVERSION"; fi; \
 	prevver=Release-`echo $$prevno | sed 's/\./-/g'`; \
 	cvs -f rdiff -c -r $$prevver -r $$thisver $(PACKAGE) \
 	    > $(PACKAGE)-$$prevno-$(VERSION).diff
diff --git a/lib/am/progs.am b/lib/am/progs.am
index 401a3a307..28c0a5743 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -27,7 +27,7 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS)
 ## a real libtool, its behaviour is identical to normal INSTALL_PROGRAM.
 ## Note that we explicitly set the libtool mode.  This avoids any lossage
 ## if the program doesn't have a name that libtool expects.
-	    $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
+	    @LIBTOOL@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
 	  else :; fi; \
 	done
 
diff --git a/progs.am b/progs.am
index 401a3a307..28c0a5743 100644
--- a/progs.am
+++ b/progs.am
@@ -27,7 +27,7 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS)
 ## a real libtool, its behaviour is identical to normal INSTALL_PROGRAM.
 ## Note that we explicitly set the libtool mode.  This avoids any lossage
 ## if the program doesn't have a name that libtool expects.
-	    $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
+	    @LIBTOOL@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
 	  else :; fi; \
 	done
 
diff --git a/version.texi b/version.texi
index 68f8c77c2..ba348410e 100644
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
 @set UPDATED 28 November 1996
-@set EDITION 1.1i
-@set VERSION 1.1i
+@set EDITION 1.1j
+@set VERSION 1.1j