* lib/am/distdir.am (distdir): Create $dc_destdir right before

its use.
Reported by Akim Demaille.

diff --git a/ChangeLog b/ChangeLog
index 2b637ba6ac63b0d889fc904b025d966ac87c37f6..b08514cd6a17544b00802ba82697b47f0c6a50be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-09-30  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
+       * lib/am/distdir.am (distdir): Create $dc_destdir right before
+       its use.
+       Reported by Akim Demaille.
+
        Fix for PR automake/366:
        * automake.in (handle_dist): Strip $(srcdir) and replace
        $(top_srcdir) when computing DIST_COMMON directories.

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index da6240738cc57e3d2a5454c1dde90fac41aca685..67f3f59a667449a62f56079b23bb02c56efdc8a5 100644 (file)
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -308,9 +308,6 @@ distcheck: dist
 ## create this directory under $dc_install_base, because it would
 ## create very long directory names.
          && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-## Build the directory, so we can cd into it even if `make install'
-## didn't create it.
-         && $(mkinstalldirs) $$dc_destdir \
 ?DISTCHECK-HOOK?         && $(MAKE) $(AM_MAKEFLAGS) distcheck-hook \
          && cd $(distdir)/=build \
          && ../configure --srcdir=.. --prefix="$$dc_install_base" \
@@ -335,7 +332,11 @@ distcheck: dist
 ## The logic here is quite convoluted because we must clean $dc_destdir
 ## whatever happens (it won't be erased by the next run of distcheck like
 ## $(distdir) is).
-         && ({   $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+         && ({ \
+## Build the directory, so we can cd into it even if `make install'
+## didn't create it.
+              (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
               && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
               && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
                    distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \