dist bug fix

diff --git a/ChangeLog b/ChangeLog
index 27a21e5a6e7d8e1bea7d0e00979adb48b17656ef..6235941eb89019c7da528ae1644b14dd888d57db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Wed Sep 24 16:10:37 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_dist_worker): Correctly handle subdirs that
+       have their own configure.in.  From Peter Mattis.
+
        * automake.in (handle_yacc_lex_cxx): Handle de-ansi-fied sources
        in srcdir as well as build dir.
 

diff --git a/THANKS b/THANKS
index 81ebbcbdda5c867d9797b43346fff471db7a35bb..2c9fcd912b5c6d68c1e5814c08be3631d908035e 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -42,6 +42,7 @@ Michael Brantley <Michael-Brantley@deshaw.com>
 Noah Friedman <friedman@gnu.ai.mit.edu>
 Nyul Laszlo <nyul@sol.cc.u-szeged.hu>
 Per Bothner <bothner@cygnus.com>
+Peter Mattis <petm@scam.XCF.Berkeley.EDU>
 Phil Nelson <phil@cs.wwu.edu>
 Ralph Schleicher <rs@purple.UL.BaWue.DE>
 Ramón García Fernández <ramon@jl1.quim.ucm.es>

diff --git a/automake.in b/automake.in
index 05e9e80ec28b953421aa4d21f1af5155fda7563a..66e2bc223155967c1ffceb790dc5587dd7e89059 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2320,8 +2320,9 @@ sub handle_dist_worker
             # weirdness.
             "\t" . 'here=`cd $(top_builddir) && pwd`; ' . "\\\n"
             . "\t" . 'top_distdir=`cd $(top_distdir) && pwd`; ' . "\\\n"
+            . "\t" . 'distdir=`cd $(distdir) && pwd`; ' . "\\\n"
             . "\tcd \$(top_srcdir) \\\n"
-            . "\t  && \$(AUTOMAKE) --include-deps --build-dir=\$\$here --srcdir-name=\$(top_srcdir) --output-dir=\$\$top_distdir "
+            . "\t  && \$(AUTOMAKE) --include-deps --build-dir=\$\$here --srcdir-name=\$(top_srcdir) --output-dir=\$\$distdir "
             # Set strictness of output.
             . ($cygnus_mode ? '--cygnus' : ('--' . $strictness_name))
             . ($cmdline_use_dependencies ? '' : ' --include-deps')