8 files changed, 34 insertions, 8 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index b166262a7ca..a9d45ef2a4c 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-12  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (MKDIR_P): New, set by configure.
+        (mkinfodir): Use $MKDIR_P.
+
 2012-05-10  Glenn Morris  <rgm@gnu.org>
 
         * mule.texi (Disabling Multibyte): Replace the obsolete "unibyte: t"
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 0e03efd9877..7ffbf52e94f 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -35,6 +35,8 @@ infodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
+MKDIR_P = @MKDIR_P@
+
 INFO_EXT=@INFO_EXT@
 # Options used only when making info output.
 # --no-split is only needed because of MS-DOS.
@@ -118,10 +120,8 @@ EMACSSOURCES= \
         $(EMACS_XTRA)
 
 ## This seems pointless.  The info/ directory exists in both the
-## repository and the release tarfiles.  We do not use any
-## equivalent of mkdir -p/install-sh -d, so this is not a general
-## solution anyway.  The second test -d is for parallel builds.
-mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
+## repository and the release tarfiles.
+mkinfodir = @${MKDIR_P} ${infodir}
 
 .PHONY: info dvi html pdf ps
 
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 1191b0de919..126c10c4342 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-12  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (MKDIR_P): New, set by configure.
+        (mkinfodir): Use $MKDIR_P.
+
 2012-05-05  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp-intro.texi (Making Errors): Don't mention Emacs 20.
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 29f5344b8c6..bf10e5c73b7 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -26,6 +26,8 @@ infodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
+MKDIR_P = @MKDIR_P@
+
 INFO_EXT=@INFO_EXT@
 # Options used only when making info output.
 INFO_OPTS=@INFO_OPTS@
@@ -39,7 +41,7 @@ DVIPS = dvips
 ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
          MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
 
-mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
+mkinfodir = @${MKDIR_P} ${infodir}
 
 .PHONY: info dvi html pdf ps
 
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index b56164669f8..c3b50dbdcd5 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-12  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (MKDIR_P): New, set by configure.
+        (mkinfodir): Use $MKDIR_P.
+
 2012-05-10  Glenn Morris  <rgm@gnu.org>
 
         * loading.texi (Loading Non-ASCII): Replace the obsolete "unibyte: t"
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index f1e3fba3691..dd820d85133 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -30,6 +30,8 @@ texinfodir = $(srcdir)/../misc
 # Directory with emacsver.texi.
 emacsdir =  $(srcdir)/../emacs
 
+MKDIR_P = @MKDIR_P@
+
 INFO_EXT=@INFO_EXT@
 # Options used only when making info output.
 INFO_OPTS=@INFO_OPTS@
@@ -99,7 +101,7 @@ srcs = \
   $(srcdir)/gpl.texi \
   $(srcdir)/doclicense.texi
 
-mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
+mkinfodir = @${MKDIR_P} ${infodir}
 
 .PHONY: info dvi pdf ps
 
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 72e784f1f8d..1765c22d790 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-12  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (MKDIR_P): New, set by configure.
+        (mkinfodir): Use $MKDIR_P.
+
 2012-05-07  Glenn Morris  <rgm@gnu.org>
 
         * forms.texi (Long Example): Update for changed location of files.
@@ -8995,7 +9000,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 83bc2d7bf33..30fdbccee75 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -38,6 +38,8 @@ infodir=../../info
 ## Currently only used by efaq and calc.
 emacsdir = $(srcdir)/../emacs
 
+MKDIR_P = @MKDIR_P@
+
 INFO_EXT=@INFO_EXT@
 # Options used only when making info output.
 INFO_OPTS=@INFO_OPTS@
@@ -211,7 +213,7 @@ TEXI2PDF = texi2pdf
 ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \
          MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
 
-mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
+mkinfodir = @${MKDIR_P} ${srcdir}/${infodir}
 
 .PHONY: info dvi pdf echo-info