From: Tom Tromey <tromey@redhat.com>
Date: Thu, 28 Mar 1996 06:34:10 +0000 (+0000)
Subject: Bug fixes.  Added new test.
X-Git-Tag: Release-0-32~25
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=71e0d17e6243cff7ba0e8a2ab0dd18896b8e661b;p=automake.git

Bug fixes.  Added new test.
---

diff --git a/ChangeLog b/ChangeLog
index e2c0e47d..7c082689 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@ Tue Mar 26 13:47:54 1996  Tom Tromey  <tromey@creche.cygnus.com>
 	* automake.in (handle_dist_worker): Find NEWS in srcdir.
 	($RULE_PATTERN): Include chars "$(){}/" in allowable patterns in a
 	rule.
+	(require_config_file): Set config_aux_path when file found.
+	($config_aux_dir): New variable.
+	(require_config_file): Set it.
+	(handle_man_pages): Find mkinstalldirs in config_aux_dir.
 
 Mon Mar 25 15:32:57 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
diff --git a/NEWS b/NEWS
index 05f40d98..faa9c960 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+New in 0.32:
+* Many bug fixes
+
 New in 0.31:
 * Bug fixes
 * Documentation updates (many from François Pinard)
diff --git a/THANKS b/THANKS
index 5a04ee42..f7cab37a 100644
--- a/THANKS
+++ b/THANKS
@@ -2,6 +2,7 @@ Automake was originally written by David J. MacKenzie <djm@uunet.uu.net>.
 It would not be what it is today without the invaluable help of these
 people:
 
+Dieter Baron <dillo@stieltjes.smc.univie.ac.at>
 François Pinard <pinard@iro.umontreal.ca>
 Gord Matzigkeit <gord@enci.ucalgary.ca>
 Greg A. Woods <woods@most.weird.com>
diff --git a/TODO b/TODO
index 30643cdb..bc79e90b 100644
--- a/TODO
+++ b/TODO
@@ -3,6 +3,7 @@ Priorities for release:
 * Only require AC_ARG_PROGRAM if a program installed
   this requires omitting vars in this case as well
 * Add test case for recent RULE_PATTERN change
+* Add Dieter's idea of dist-local target; document
 
 Other priorities:
 * Must rewrite am_install_var.  Should break into multiple functions.
diff --git a/automake.in b/automake.in
index 9e1cedc7..c9773a77 100755
--- a/automake.in
+++ b/automake.in
@@ -102,6 +102,7 @@ $ac_output_line = 0;
 # List of directories to search for configure-required files.  This
 # can be set by AC_CONFIG_AUX_DIR.
 @config_aux_path = ('.', '..', '../..');
+$config_aux_dir = '';
 
 # Whether AC_PROG_MAKE_SET has been seen in configure.in.
 $seen_make_set = 0;
@@ -916,7 +917,8 @@ sub handle_man_pages
     foreach (keys %sections)
     {
 	push (@installdirs, '$(mandir)/man' . $_);
-	$output_rules .= ("\t" . '$(top_srcdir)/mkinstalldirs $(mandir)/man'
+	$output_rules .= ("\t" . $config_aux_dir
+			  . 'mkinstalldirs $(mandir)/man'
 			  . $_ . "\n");
     }
     push (@phony, 'install-man');
@@ -2690,6 +2692,14 @@ sub require_config_file
 	    {
 		$found_it = 1;
 		&push_dist_common ($file) if $dir eq $relative_dir;
+
+		# The first config file found set the config aux path
+		# for all other files.
+		@config_aux_path = $dir;
+		$config_aux_dir = '$(top_srcdir)';
+		$config_aux_dir .= '/' . $dir
+		    unless $dir eq '.';
+
 		last;
 	    }
 	}
diff --git a/tests/ChangeLog b/tests/ChangeLog
index be5cae08..cbac83fd 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 27 23:31:51 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+	* rulepat.test: New file.
+
 Sat Mar 16 08:37:36 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
 	* empty.test: New file.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 238c4ec3..46dbe497 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = gnits
 TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test \
 acoutnoq.test acouttbs.test libobj.test proginst.test acoutqnl.test \
 confincl.test spelling.test prefix.test badprog.test depend.test exdir.test \
-canon.test installsh.test empty.test
+canon.test installsh.test empty.test rulepat.test
 
 ## Maybe automake should distribute TESTS?  You tell me.
 EXTRA_DIST = defs $(TESTS)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 8c843790..a5407b7b 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -43,7 +43,7 @@ AUTOMAKE_OPTIONS = gnits
 TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test \
 acoutnoq.test acouttbs.test libobj.test proginst.test acoutqnl.test \
 confincl.test spelling.test prefix.test badprog.test depend.test exdir.test \
-canon.test installsh.test empty.test
+canon.test installsh.test empty.test rulepat.test
 
 EXTRA_DIST = defs $(TESTS)
 DIST_COMMON = ChangeLog Makefile.am Makefile.in
diff --git a/tests/rulepat.test b/tests/rulepat.test
new file mode 100755
index 00000000..1a1544ce
--- /dev/null
+++ b/tests/rulepat.test
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+# Test to make sure RULE_PATTERN catches strange targets.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+$(srcdir)/Makefile.am:
+END
+
+$AUTOMAKE || exit 1
+
+grep '^$(srcdir)/Makefile\.am' Makefile.in