* tests/output7.test: Populate sub/ with a dummy file, so that it

is not empty.  This fixes a failure reported by Patrick Welche.
* lib/am/distdir.am: Add note about tar's `-o' option and empty
directories.

diff --git a/ChangeLog b/ChangeLog
index a05e5e6e8efffc1be7dc7dc11b3f620fb1a0e4f2..d1fd476cdcfbe29ca630f5cf2dc9c4b207e61e99 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-25  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * tests/output7.test: Populate sub/ with a dummy file, so that it
+       is not empty.  This fixes a failure reported by Patrick Welche.
+       * lib/am/distdir.am: Add note about tar's `-o' option and empty
+       directories.
+
 2003-10-24  Didier Cassirame  <faded@free.fr>  (tiny change)
 
        * lib/ylwrap: Typo in regex.

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index debc71b05d8c8ea3b284d01e9a0f43661fc83aaf..c269f4c4c2d15ff687d000a8f674e5524ab7ead6 100644 (file)
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -210,6 +210,13 @@ endif %?TOPDIR_P%
 ## Note that we don't use GNU tar's `-z' option.  One reason (but not
 ## the only reason) is that some versions of tar (e.g., OSF1)
 ## interpret `-z' differently.
+##
+## The -o option of GNU tar used to exclude empty directories.  This
+## behavior was fixed in tar 1.12 (released on 1997-04-25).  But older
+## versions of tar are still used (for instance NetBSD 1.6.1 ships
+## with tar 1.11.2).  We do not do anything specific w.r.t. this
+## incompatibility since packages where empty directories need to be
+## present in the archive are really unusual.
 
 if %?TOPDIR_P%
 

diff --git a/tests/output7.test b/tests/output7.test
index eb9c65992b1f862a50b8032f98b3cb4d690bd328..f26251cb63baf5189d2ce1cfb5ee07b04ccfab94 100755 (executable)
--- a/tests/output7.test
+++ b/tests/output7.test
@@ -43,6 +43,7 @@ all-local:
 EOF
 
 cat >mk/sub.am <<'EOF'
+EXTRA_DIST = foo
 all-local:
        @echo in--sub
 EOF
@@ -53,6 +54,17 @@ all-local:
 SUBDIRS = mk sub
 EOF
 
+# We have to distribute something in foo, because some versions
+# of tar do not archive empty directories when passed the `o'
+# flags.  (This was fixed in GNU tar 1.12, but older
+# versions are still used: NetBSD 1.6.1 ships with tar 1.11.2).
+#
+# If sub/ is missing from the archive, config.status will fail
+# to compute $ac_abs_srcdir during a VPATH build: config.status
+# is able to create sub/ in the build tree, but it assumes the
+# directory already exists in the source tree.
+echo bar > sub/foo
+
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE