From: Tom Tromey <tromey@redhat.com>
Date: Wed, 24 Sep 1997 23:37:08 +0000 (+0000)
Subject: dist bug fix
X-Git-Tag: Release-1-2b~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49e7073d1980e8c09f21a2b62e44ee544d45be0e;p=thirdparty%2Fautomake.git

dist bug fix
---

diff --git a/ChangeLog b/ChangeLog
index 27a21e5a6..6235941eb 100644
--- 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 81ebbcbdd..2c9fcd912 100644
--- 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 05e9e80ec..66e2bc223 100755
--- 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')