From: Tom Tromey <tromey@redhat.com>
Date: Sun, 6 May 2001 19:00:23 +0000 (+0000)
Subject: 	* distdir.am (distdir): Make subdirectory for each file.
X-Git-Tag: handle-languages~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=482129a77720c23367c45b06fda2ba6fbd40da55;p=thirdparty%2Fautomake.git

	* distdir.am (distdir): Make subdirectory for each file.
	Fixes test subobj5.test.
---

diff --git a/ChangeLog b/ChangeLog
index 71f9f3901..cd798b599 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-05-06  Tom Tromey  <tromey@redhat.com>
 
+	* distdir.am (distdir): Make subdirectory for each file.
+	Fixes test subobj5.test.
+
 	* tests/Makefile.am (TESTS): Added new file.
 	(XFAIL_TESTS): Likewise.
 	* tests/texinfo10.test: New file.
diff --git a/distdir.am b/distdir.am
index 9dbc8dd7c..2f3752151 100644
--- a/distdir.am
+++ b/distdir.am
@@ -61,6 +61,13 @@ endif %?TOPDIR_P%
 ##
 ?CYGNUS?	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 ?!CYGNUS?	  d=$(srcdir); \
+## Make the subdirectory for the file.  This is going to make `dist'
+## really crawl, but it seems like the only way to do it, given that
+## files in subdirectories can be specified for `dist' conditionally.
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 ##
 	  if test -d $$d/$$file; then \
 ## Don't mention $$file in destination argument, since this fails if
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 9dbc8dd7c..2f3752151 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -61,6 +61,13 @@ endif %?TOPDIR_P%
 ##
 ?CYGNUS?	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 ?!CYGNUS?	  d=$(srcdir); \
+## Make the subdirectory for the file.  This is going to make `dist'
+## really crawl, but it seems like the only way to do it, given that
+## files in subdirectories can be specified for `dist' conditionally.
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 ##
 	  if test -d $$d/$$file; then \
 ## Don't mention $$file in destination argument, since this fails if