From 502cf414cc6931845b697d44a7a4f1afa032f471 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 6 May 2001 19:00:23 +0000 Subject: [PATCH] * distdir.am (distdir): Make subdirectory for each file. Fixes test subobj5.test. --- ChangeLog | 3 +++ distdir.am | 7 +++++++ lib/am/distdir.am | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index 71f9f390..cd798b59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2001-05-06 Tom Tromey + * 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 9dbc8dd7..2f375215 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 9dbc8dd7..2f375215 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 -- 2.43.5