From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sun, 20 Aug 2006 14:28:43 +0000 (+0000)
Subject: * m4/mkdirp.m4 (AM_PROG_MKDIR_P): Prefix mkdir_p with
X-Git-Tag: Release-1-9b~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fde0797906cc0220df9e31347455ccba903a6551;p=thirdparty%2Fautomake.git

* m4/mkdirp.m4 (AM_PROG_MKDIR_P): Prefix mkdir_p with
$(top_builddir)/ if it is a relative directory.
---

diff --git a/ChangeLog b/ChangeLog
index d551bce18..145fe90d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-20  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* m4/mkdirp.m4 (AM_PROG_MKDIR_P): Prefix mkdir_p with
+	$(top_builddir)/ if it is a relative directory.
+
 2006-08-19  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* lib/am/lex.am, lib/am/yacc.am: Drop the inline rules, always use
diff --git a/configure b/configure
index 207420008..082c7eac6 100755
--- a/configure
+++ b/configure
@@ -1928,6 +1928,10 @@ fi
 echo "${ECHO_T}$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  \\/$* | ?:\\/*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 
 for ac_prog in gawk mawk nawk awk
 do
diff --git a/m4/mkdirp.m4 b/m4/mkdirp.m4
index 553cac21d..a120b4aa2 100644
--- a/m4/mkdirp.m4
+++ b/m4/mkdirp.m4
@@ -11,9 +11,16 @@
 AC_DEFUN([AM_PROG_MKDIR_P],
 [AC_PREREQ([2.60])dnl
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.
-dnl We now use MKDIR_P, while keeping a definition of mkdir_p for
-dnl backward compatibility. Do not define mkdir_p as $(MKDIR_P) for
-dnl the sake of Makefile.ins that do not define MKDIR_P.
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
 AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 ])