* lib/am/distdir.am (distdir): Also look for directory in build

directory first. (See 2001-05-14.)
* tests/Makefile.am (TESTS): Add extra5.test.
* tests/extra5.test: New file.
From Dean Povey.

diff --git a/ChangeLog b/ChangeLog
index eb022a1329a1ab5e466d5534d5bb322432f3429f..4899d203b5d488b970ba45014d4b9cd3f1ce679e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-09  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * lib/am/distdir.am (distdir): Also look for directory in build
+       directory first. (See 2001-05-14.)
+       * tests/Makefile.am (TESTS): Add extra5.test.
+       * tests/extra5.test: New file.
+       From Dean Povey.
+
 2001-11-09  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        Fix for distcommon2.test:

diff --git a/NEWS b/NEWS
index 8c8dfe643b5c7f3983d4e1ca2cda7e6238c9bc5d..1570615a93e3a01a76adfc6423f54b05c16342e0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ New in 1.5a:
   are no longer shipped, since Autoconf 2.52 provides them (both as AM_
   and AC_).
 * `#line' of Lex and Yacc files are properly set.
+* EXTRA_DIST can contain generated directories.
 * Fixed CDPATH portability problems, in particular for MacOS X.
 * Fixed handling of nobase_ targets.
 * Fixed support of implicit rules leading to .lo objects.

diff --git a/THANKS b/THANKS
index 90274228f9c1524cbef8f074a1d7fc0ad349638a..c867743833f5e881c624e7001a6b287e0f2d58f3 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -33,6 +33,7 @@ Dave Brolley          brolley@redhat.com
 Dave Morrison          dave@bnl.gov
 David A. Swierczek     swiercze@mr.med.ge.com
 David Zaroski          cz253@cleveland.Freenet.Edu
+Dean Povey             dpovey@wedgetail.com
 Derek R. Price         derek.price@openavenue.com
 Dieter Baron           dillo@stieltjes.smc.univie.ac.at
 Dmitry Mikhin          dmitrym@acres.com.au

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index e519df2e45e8d7ceaacfbf98d704f5ea0ea7f7c1..24183b6608cadfc9e25bda5ef9a2c4842441b1e3 100644 (file)
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -65,9 +65,10 @@ endif %?TOPDIR_P%
 ##
 ## Always look for the file in the build directory first.  That way
 ## for something like yacc output we will correctly pick up the latest
-## version.
+## version.  Also check for directories in the build directory first,
+## so one can ship generated directories.
 ##
-         if test -f $$file; then d=.; else d=$(srcdir); fi; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 ##
 ## 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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 759e5d91a8ea147fb8d0c7f815b376a715b82533..3dc3433d16bca4e4c25bde51dcb01bf703c687ed 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -138,6 +138,7 @@ ext.test \
 extra.test \
 extra3.test \
 extra4.test \
+extra5.test \
 flibs.test \
 fnoc.test \
 fo.test        \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index a326071110389b078f800d2f3bf7e80bf78a6806..cbdf2182dc66f16ee31632f79a46044cc1daf33f 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -211,6 +211,7 @@ ext.test \
 extra.test \
 extra3.test \
 extra4.test \
+extra5.test \
 flibs.test \
 fnoc.test \
 fo.test        \
@@ -486,7 +487,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
-         if test -f $$file; then d=.; else d=$(srcdir); fi; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
          if test "$$dir" != "$$file" && test "$$dir" != "."; then \
            $(mkinstalldirs) "$(distdir)/$$dir"; \

diff --git a/tests/extra5.test b/tests/extra5.test
new file mode 100755 (executable)
index 0000000..58f7b99
--- /dev/null
+++ b/tests/extra5.test
@@ -0,0 +1,26 @@
+#! /bin/sh
+
+# Check to make sure EXTRA_DIST can contain a directory from $buildir.
+# From Dean Povey.
+
+. $srcdir/defs || exit 1
+
+echo AC_OUTPUT >> configure.in
+
+cat > Makefile.am << 'END'
+EXTRA_DIST=foo
+
+foo:
+       mkdir foo
+       touch foo/bar
+END
+
+set -e
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+mkdir build
+cd build
+../configure
+make distdir