From: Tom Tromey <tromey@redhat.com>
Date: Sun, 19 Dec 1999 08:46:15 +0000 (+0000)
Subject: 	* automake.in (handle_dist_worker): Scan DIST_COMMON to see if
X-Git-Tag: Release-1-4b~138
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=77f437a79a8707823e19828141e9969d4a12e1b8;p=automake.git

	* 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 ed08abd1..bf158d41 100644
--- 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 695cbb1d..bc222ef3 100644
--- 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 69dc9c39..9d8e96b1 100755
--- 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