Bug fix

diff --git a/ChangeLog b/ChangeLog
index c9990ac7af5cc9f7ef08303aec0ca63e6a392575..083746fefed3382d201aed1d3ad02e10a4f4bcde 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 22 09:49:27 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * automake.in (initialize_per_input): Don't initialize
+       $output_directory here; initialize it globally.  From Joshua
+       Cowan.  Test outdir.test.
+
 Sat May 18 10:57:40 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * automake.in (handle_tests): Don't push TESTS onto dist_common.

diff --git a/Makefile.in b/Makefile.in
index 4c6bafcf5ae304810eb1409ae88cf83cb0318857..61027dc5959dca4545d26fc90a835a797f953f56 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -300,6 +300,9 @@ distdir: $(DEP_DISTFILES)
        rm -rf $(distdir)
        mkdir $(distdir)
        chmod 777 $(distdir)
+       distdir=`cd $(distdir) && pwd` \
+         && cd $(srcdir) \
+         && automake --include-deps --output-dir=$$distdir --strictness=gnits
        @for file in `cd $(srcdir) && echo $(DISTFILES)`; do \
          test -f $(distdir)/$$file \
          || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \

diff --git a/THANKS b/THANKS
index a59ebb58cffbb03c6e367c8c58c8bf914ccc8ff8..deb58eeca3db60a7329edd243c87951bfa01f1db 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -11,6 +11,7 @@ Henrik Frystyk Nielsen <frystyk@w3.org>
 Jerome Santini <santini@chambord.univ-orleans.fr>
 Jim Meyering <meyering@na-net.ornl.gov>
 Joerg-Martin Schwarz <jms@jms.prima.ruhr.de>
+Joshua Cowan <jcowan@jcowan.reslife.okstate.edu>
 Karl Berry <kb@cs.umb.edu>
 Mark Galassi <rosalia@nis.lanl.gov>
 Markku Rossi <mtr@ngs.fi>

diff --git a/TODO b/TODO
index 23e18c94bc117d5c965652d7d37fa138f052299f..02a11893ace12fdd0fb7372e8911c7d0e25f3d32 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,10 @@
 Priorities for release:
   [ none ]
 
+should be able to determine what is built by looking at rules (and
+configure.in).  Then built man pages (eg) could automatically be
+omitted from the distribution.
+
 Consider using libfoo_SOURCES, etc, for libraries.  From Gord
 Matzigkeit.  There is a patch.
 

diff --git a/automake.in b/automake.in
index 33f657571bd0b9911105adf80041f7ebe834e4e7..be5df8e67b03db4fc5c9507f309f2da7d6463e2b 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -88,6 +88,10 @@ $config_header = '';
 # Line number at which AC_CONFIG_HEADER appears in configure.in.
 $config_header_line = 0;
 
+# Directory where output files go.  Actually, output files are
+# relative to this directory.
+$output_directory = '.';
+
 # Relative location of top build directory.
 $top_builddir = '';
 
@@ -2470,10 +2474,6 @@ sub initialize_per_input
     # Eg for src/Makefile.in, this is "src".
     $relative_dir = '';
 
-    # Directory where output files go.  Actually, output files are
-    # relative to this directory.
-    $output_directory = '.';
-
     # This holds a list of files that are included in the
     # distribution.
     %dist_common = ();

diff --git a/tests/ChangeLog b/tests/ChangeLog
index bc06985d45faaf2b1ff1a4e914249d9e65dbfa3f..c323e1f19e459d45e65f5d018538d1529c8361bb 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Wed May 22 09:45:52 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * outdir.test: New file.
+
 Sat May 18 10:51:37 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * insh2.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f3264515555ff753bc6300a391aaf35ee4b1dc40..e519b7f81deca604afb0fe3d61915ed0b7f576a5 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,6 +8,6 @@ confincl.test spelling.test prefix.test badprog.test depend.test exdir.test \
 canon.test installsh.test empty.test rulepat.test insh.test canon2.test \
 target.test extra.test noinst.test instman.test mkinstall.test auxdir.test \
 canon3.test mdate2.test subdir.test backsl.test package.test number.test \
-insh2.test
+insh2.test outdir.test
 
 EXTRA_DIST = defs $(TESTS)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 611409dcfdc78f9be8769a07c8768ec7f437cdc6..91143d6bf8190eb3f3e3d51c5e769806e63eb866 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -46,7 +46,7 @@ confincl.test spelling.test prefix.test badprog.test depend.test exdir.test \
 canon.test installsh.test empty.test rulepat.test insh.test canon2.test \
 target.test extra.test noinst.test instman.test mkinstall.test auxdir.test \
 canon3.test mdate2.test subdir.test backsl.test package.test number.test \
-insh2.test
+insh2.test outdir.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(top_srcdir)/mkinstalldirs

diff --git a/tests/outdir.test b/tests/outdir.test
new file mode 100755 (executable)
index 0000000..c905568
--- /dev/null
+++ b/tests/outdir.test
@@ -0,0 +1,17 @@
+#! /bin/sh
+
+# Test to ensure that --output-dir works.  Bug report from Joshua
+# Cowan.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am <<'END'
+pkgdata_DATA =
+END
+
+mkdir zardir
+
+$AUTOMAKE --output-dir=zardir || exit 1
+
+test -f Makefile.in && exit 1
+test -f zardir/Makefile.in