* lib/autoconf/status.m4 (_AC_OUTPUT_FILE): Don't prepend

$ac_top_build_prefix to $MKDIR_P if it's just 'mkdir -p'.
* tests/tools.at (autoconf: subdirectories): New test, taken from
the corresponding problem report by Ralf Wildenhues in:
http://lists.gnu.org/archive/html/autoconf-patches/2006-05/msg00053.html

diff --git a/ChangeLog b/ChangeLog
index f2d9b073f8dc0919fec6791abce42e2740dbf51b..324202fe34ff88693bf0a1c048c8a150872ee02a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-05-18  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * lib/autoconf/status.m4 (_AC_OUTPUT_FILE): Don't prepend
+       $ac_top_build_prefix to $MKDIR_P if it's just 'mkdir -p'.
+       * tests/tools.at (autoconf: subdirectories): New test, taken from
+       the corresponding problem report by Ralf Wildenhues in:
+       http://lists.gnu.org/archive/html/autoconf-patches/2006-05/msg00053.html
+
        * lib/autoconf/functions.m4 (AC_REPLACE_FNMATCH, AC_FUNC_FNMATCH_GNU):
        Quote some uses of shell variables if they might suffer unexpected
        globbing.  This doesn't fix all instances of quoting problems that

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 14f71c8324db2242f74f62fa0b83b4a80f08b113..ffcfd9805ec9db2ef5d530383205c9586af82eb0 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -495,9 +495,10 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
   esac
 ])dnl
 AC_PROVIDE_IFELSE([AC_PROG_MKDIR_P],
-[  case $MKDIR_P in
-  [[\\/$]]* | ?:[[\\/]]* ) ac_MKDIR_P=$MKDIR_P ;;
-  *) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+[  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [[\\/$]]* | ?:[[\\/]]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
   esac
 ])dnl
 _ACEOF

diff --git a/tests/tools.at b/tests/tools.at
index 8ee71022694d6f871292cfb7449ab1f5884c5d43..f1a0ed8920684df64ed700829893252f6a409149 100644 (file)
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -309,6 +309,32 @@ AT_CHECK_AUTOCONF([], 1, [], [experr])
 AT_CLEANUP
 
 
+# autoconf: subdirectories
+# --------------------------------------
+AT_SETUP([autoconf: subdirectories])
+
+AT_DATA([configure.ac],
+[[AC_INIT
+AC_PROG_MKDIR_P
+AC_CONFIG_FILES(sub/foo)
+AC_OUTPUT
+]])
+
+mkdir sub
+
+AT_DATA([sub/foo.in],
+[[@MKDIR_P@
+]])
+
+AT_DATA([install-sh])
+
+AT_CHECK_AUTOCONF
+AT_CHECK_CONFIGURE
+AT_CHECK([grep '/mkdir -p' sub/foo], 1)
+
+AT_CLEANUP
+
+