automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

FYI: fix creation of $dc_destdir in destdir


From: Alexandre Duret-Lutz
Subject: FYI: fix creation of $dc_destdir in destdir
Date: 30 Sep 2002 15:01:38 +0200
User-agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/20.7

I'm checking this in on both branches.  $$dc_destdir was created
to early, and wasn't removed on any failures before the DESTDIR
checks.

2002-09-30  Alexandre Duret-Lutz  <address@hidden>

        * lib/am/distdir.am (distdir): Create $dc_destdir right before
        its use.
        Reported by Akim Demaille.

Index: lib/am/distdir.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/distdir.am,v
retrieving revision 1.41
diff -u -r1.41 distdir.am
--- lib/am/distdir.am   30 Sep 2002 12:32:21 -0000      1.41
+++ lib/am/distdir.am   30 Sep 2002 12:52:07 -0000
@@ -308,9 +308,6 @@
 ## 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 @@
 ## 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; \

-- 
Alexandre Duret-Lutz





reply via email to

[Prev in Thread] Current Thread [Next in Thread]