From 923e59e955c57ce7dec67f4a99d5abbc3c181e51 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Mon, 30 Sep 2002 13:02:07 +0000 Subject: [PATCH] * lib/am/distdir.am (distdir): Create $dc_destdir right before its use. Reported by Akim Demaille. --- ChangeLog | 4 ++++ lib/am/distdir.am | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b637ba6..b08514cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-09-30 Alexandre Duret-Lutz + * 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 da624073..67f3f59a 100644 --- 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; \ -- 2.43.5