From 8b2f04ddeaf6db6c992cb54ada23c263ce4b4d2f Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Sat, 7 Dec 1996 20:39:25 +0000
Subject: [PATCH] Fixlets from Ulrich; new test

---
 ChangeLog          |  5 +++++
 Makefile.in        | 18 +++++++-----------
 automake.in        |  4 ++--
 tests/ChangeLog    |  4 ++++
 tests/Makefile.am  |  2 +-
 tests/output2.test | 25 +++++++++++++++++++++++++
 6 files changed, 44 insertions(+), 14 deletions(-)
 create mode 100755 tests/output2.test

diff --git a/ChangeLog b/ChangeLog
index 2bcd3904..c1e262c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec  7 11:34:39 1996  Tom Tromey  <tromey@cygnus.com>
+
+	* automake.in (am_install_var): Quote $ in regexp substitution.
+	From Ulrich Drepper.
+
 Fri Dec  6 18:54:10 1996  Tom Tromey  <tromey@cygnus.com>
 
 	* automake.in (handle_configure): Require actual input files, not
diff --git a/Makefile.in b/Makefile.in
index ba7eb245..69895503 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,16 +95,16 @@ default: all
 
 .SUFFIXES:
 .SUFFIXES: .texi .texinfo .info .dvi
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in 
-	cd $(top_srcdir) && automake --gnits Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
 $(srcdir)/aclocal.m4: configure.in
 	cd $(srcdir) && aclocal
 
+$(srcdir)/Makefile.in: Makefile.am configure.in
+	cd $(srcdir) && automake --gnits Makefile
+
+# For an explanation of the following Makefile rules, see node
+# `Automatic Remaking' in GNU Autoconf documentation.
+Makefile: $(srcdir)/Makefile.in config.status $(BUILT_SOURCES)
+	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 config.status: configure
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure: configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES)
@@ -173,8 +173,6 @@ automake.info: automake.texi version.texi
 automake.dvi: automake.texi version.texi
 
 
-DVIPS = dvips
-
 .texi.info:
 	cd $(srcdir) \
 	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
@@ -189,8 +187,6 @@ DVIPS = dvips
 
 .texinfo.dvi:
 	TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
-.dvi.ps:
-	$(DVIPS) $< -o $@
 
 install-info-am: $(INFO_DEPS)
 	$(NORMAL_INSTALL)
diff --git a/automake.in b/automake.in
index 0f767a47..dc89fa98 100755
--- a/automake.in
+++ b/automake.in
@@ -2506,7 +2506,7 @@ sub handle_configure
 			  . "\t"
 			  . 'cd $(top_builddir) && CONFIG_FILES='
 			  . ($relative_dir eq '.' ? '' : '$(subdir)/')
-   			  . '$@' . (length (@inputs) > 1
+   			  . '$@' . (length (@rewritten_inputs) > 1
 				    ? (':' . join (':', @rewritten_inputs))
 				    : '')
 			  . ' CONFIG_HEADERS= ./config.status'
@@ -4294,7 +4294,7 @@ sub am_install_var
 	    {
 		# 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/;';
+		$more_xform = 's/\@LIBTOOL\@/\$(LIBTOOL) --mode=install/;';
 	    }
 	    else
 	    {
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 96c1d070..b3f3ff5a 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec  7 12:52:45 1996  Tom Tromey  <tromey@cygnus.com>
+
+	* output2.test: New file.
+
 Fri Dec  6 19:00:31 1996  Tom Tromey  <tromey@cygnus.com>
 
 	* output.test: New file.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0dfbd9e1..cb29e871 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,7 +19,7 @@ confsub.test primary.test primary2.test depend2.test spell3.test \
 comment2.test vpath.test symlink.test discover.test acinclude.test req.test \
 acsilent.test distdir.test lex2.test libobj4.test libobj5.test version.test \
 ranlib.test confvar.test confvar2.test stdlib.test cxxo.test colon2.test \
-colon3.test remake.test output.test
+colon3.test remake.test output.test output2.test
 
 EXTRA_DIST = defs $(TESTS)
 
diff --git a/tests/output2.test b/tests/output2.test
new file mode 100755
index 00000000..711de2d8
--- /dev/null
+++ b/tests/output2.test
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+# Another AC_OUTPUT test.  From report by Ulrich Drepper.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+AC_OUTPUT(Makefile intl/intlh.inst po/Makefile.in misc/gettextize)
+END
+
+: > Makefile.am
+
+mkdir intl po misc
+: > intl/intlh.inst.in
+: > po/Makefile.in.am
+: > misc/gettextize.in
+
+$AUTOMAKE || exit 1
+
+grep '^gettextize' Makefile.in && exit 1
+exit 0
-- 
2.43.5