* Makefile.am (maintainer-check): Check for mkdir_p in automake.in

too.
* automake.in (require_build_directory): Use MKDIR_P, not mkdir_p.

diff --git a/ChangeLog b/ChangeLog
index 5f62d0dc1fb8bdf3373f71be3ec9898140a3fdf4..c51853fe372404d23573b6cacd8fd9694b587d63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-08-20  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * Makefile.am (maintainer-check): Check for mkdir_p in automake.in
+       too.
+       * automake.in (require_build_directory): Use MKDIR_P, not mkdir_p.
+
        * m4/mkdirp.m4: Typo in previous patch.
 
        * Makefile.am (maintainer-check): Fine-tune the "Unescaped @"

diff --git a/Makefile.am b/Makefile.am
index 0c12a2aef49189f3881969ffa653ab6660ed8662..0e13d96c13319841b1d45cf406e625d88ce40a72 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -268,7 +268,8 @@ maintainer-check: automake aclocal
          echo 'Do not use egrep or fgrep in the above files, they are not portable.' 1>&2; \
          exit 1; \
        fi
-       @if grep 'mkdir_p' $(srcdir)/lib/am/*.am $(srcdir)/tests/*.test; then \
+       @if grep 'mkdir_p' $(srcdir)/automake.in \
+             $(srcdir)/lib/am/*.am $(srcdir)/tests/*.test; then \
          echo 'Do not use mkdir_p in the above files, use MKDIR_P.' 1>&2; \
          exit 1; \
        fi

diff --git a/automake.in b/automake.in
index 1d4d5eb5a131460f1207807c2c5497f4c4d598ac..35fb1987759a0bb009b2ec2260023fd047460773 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4032,7 +4032,7 @@ sub handle_configure ($$$@)
     }
   else
     {
-      # Use $(install_sh), not $(mkdir_p) because the latter requires
+      # Use $(install_sh), not $(MKDIR_P) because the latter requires
       # at least one argument, and $(mkinstalldirs) used to work
       # even without arguments (e.g. $(mkinstalldirs) $(conditional_dir)).
       define_variable ('mkinstalldirs', '$(install_sh) -d', INTERNAL);
@@ -7294,7 +7294,7 @@ sub require_build_directory ($)
   $clean_files{$dirstamp} = DIST_CLEAN;
 
   $output_rules .= ("$dirstamp:\n"
-                   . "\t\@\$(mkdir_p) $directory\n"
+                   . "\t\@\$(MKDIR_P) $directory\n"
                    . "\t\@: > $dirstamp\n");
 
   return $dirstamp;