* distdir.am (distdir): Make subdirectory for each file.

	Fixes test subobj5.test.

diff --git a/ChangeLog b/ChangeLog
index 71f9f390109ea6c4012b3c27ebdc42e6ae53e0ff..cd798b5995d95da79a69eb89e66f3946ee8dfb26 100644 (file)
--- 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 9dbc8dd7c8cdcb612306fd56916304cd2f791f98..2f3752151e9027e9a9ca5c88cd3cf31219a8e94e 100644 (file)
--- 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 9dbc8dd7c8cdcb612306fd56916304cd2f791f98..2f3752151e9027e9a9ca5c88cd3cf31219a8e94e 100644 (file)
--- 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