* automake.in (handle_dist_worker): Scan DIST_COMMON to see if

	more subdirs are defined.  From Axel Belinfante.  Fixes
	PR automake/2.

diff --git a/ChangeLog b/ChangeLog
index ed08abd18f50a6bc3416ca79ced5d126f86e95be..bf158d412372b8130b81f1a17bc051b6356496a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-12-19  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_dist_worker): Scan DIST_COMMON to see if
+       more subdirs are defined.  From Axel Belinfante.  Fixes
+       PR automake/2.
+
 1999-12-18  Tom Tromey  <tromey@cygnus.com>
 
        Partial fix for PR automake/40:

diff --git a/THANKS b/THANKS
index 695cbb1deed814af5766390acc4fef3706e86ef1..bc222ef325e080dbdf706f5d76a715777f320237 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -10,6 +10,7 @@ Andrew Cagney         cagney@tpgi.com.au
 Andris Pavenis         pavenis@lanet.lv
 Anthony Green          green@cygnus.com
 Assar Westerlund       assar@sics.se
+Axel Belinfante                Axel.Belinfante@cs.utwente.nl
 Bernard Urban          Bernard.Urban@meteo.fr
 Bill Currie            bcurrie@tssc.co.nz
 Bill Davidson          bill@kayhay.com

diff --git a/automake.in b/automake.in
index 69dc9c39d18c024429b3913127bca122aa4c367c..9d8e96b1d96f64375a1c8b5d2b5b995e550aecb2 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2610,6 +2610,17 @@ sub handle_dist_worker
                unless $_ eq '.';
        }
     }
+
+    # We have to check DIST_COMMON for extra directories in case the
+    # user put a source used in AC_OUTPUT into a subdir.
+    foreach (&variable_value_as_list ('DIST_COMMON', ''))
+    {
+       next if /^\@.*\@$/;
+       next unless s,/+[^/]+$,,;
+       push (@dist_dirs, $_)
+           unless $_ eq '.';
+    }
+
     if (@dist_dirs)
     {
        # Prepend $(distdir) to each directory given.  Doing it via a