[Emacs-diffs] /srv/bzr/emacs/trunk r108201: Let configure test for a suitable mkdir -p

[Glenn Morris]

------------------------------------------------------------
revno: 108201
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-05-11 20:57:48 -0400
message:
  Let configure test for a suitable mkdir -p
  
  * configure.in (AC_PROG_MKDIR_P): Call it, to set MKDIR_P.
  (MKDEPDIR): Use $MKDIR_P.
  
  * Makefile.in (MKDIR_P): New, set by configure.
  (mkdir): Use $MKDIR_P.
  
  * doc/emacs/Makefile.in (MKDIR_P): New, set by configure.
  (mkinfodir): Use $MKDIR_P.
  
  * doc/lispintro/Makefile.in (MKDIR_P): New, set by configure.
  (mkinfodir): Use $MKDIR_P.
  
  * doc/lispref/Makefile.in (MKDIR_P): New, set by configure.
  (mkinfodir): Use $MKDIR_P.
  
  * doc/misc/Makefile.in (MKDIR_P): New, set by configure.
  (mkinfodir): Use $MKDIR_P.
  
  * src/Makefile.in (MKDIR_P): New, set by configure.
  
  * src/ns.mk (${ns_appdir}, ${ns_appbindir}Emacs): Use $MKDIR_P.
modified:
  ChangeLog
  Makefile.in
  configure.in
  doc/emacs/ChangeLog
  doc/emacs/Makefile.in
  doc/lispintro/ChangeLog
  doc/lispintro/Makefile.in
  doc/lispref/ChangeLog
  doc/lispref/Makefile.in
  doc/misc/ChangeLog
  doc/misc/Makefile.in
  src/ChangeLog
  src/Makefile.in
  src/ns.mk

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-11 17:13:18 +0000
+++ b/ChangeLog 2012-05-12 00:57:48 +0000
@@ -1,3 +1,10 @@
+2012-05-12  Glenn Morris  <address@hidden>
+
+       * configure.in (AC_PROG_MKDIR_P): Call it, to set MKDIR_P.
+       (MKDEPDIR): Use $MKDIR_P.
+       * Makefile.in (MKDIR_P): New, set by configure.
+       (mkdir): Use $MKDIR_P.
+
 2012-05-11  Glenn Morris  <address@hidden>
 
        * Makefile.in (install-arch-indep): There are no more Makefile.c files.

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-05-11 17:13:18 +0000
+++ b/Makefile.in       2012-05-12 00:57:48 +0000
@@ -229,7 +229,7 @@
 # Note that if the system does not provide a suitable install,
 # configure will use build-aux/install-sh.  Annoyingly, it does
 # not use an absolute path.  So we must take care to always run
-# INSTALL-type commands from the top-level directory.
+# INSTALL-type commands from the directory containing the Makefile.
 # This explains (I think) the cd thisdir seen in several install rules.
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -237,6 +237,7 @@
 INSTALL_INFO = @INSTALL_INFO@
 # By default, we uphold the dignity of our programs.
 INSTALL_STRIP =
+MKDIR_P = @MKDIR_P@
 
 # We use gzip to compress installed .el files.
 GZIP_PROG = @GZIP_PROG@
@@ -659,10 +660,7 @@
 install-strip:
        $(MAKE) $(MFLAGS) INSTALL_STRIP=-s install
 
-### Build all the directories we're going to install Emacs in. Since
-### we may be creating several layers of directories (for example,
-### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use install-sh -d
-### instead of mkdir.  Not all systems' mkdir programs have the `-p' flag.
+### Build all the directories we're going to install Emacs in.
 ### We set the umask so that any created directories are world-readable.
 ### FIXME it would be good to warn about non-standard permissions of
 ### pre-existing directories, but that does not seem easy.
@@ -675,7 +673,7 @@
        done ; \
        icondirs=`echo "$${icondirs}" | sed 
's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},g'` ; \
        umask 022 ; \
-       $(srcdir)/build-aux/install-sh -d $(DESTDIR)${datadir} ${COPYDESTS} \
+       $(MKDIR_P) $(DESTDIR)${datadir} ${COPYDESTS} \
          $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
          $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
          $(DESTDIR)${datadir}/emacs/site-lisp \

=== modified file 'configure.in'
--- a/configure.in      2012-05-10 03:40:20 +0000
+++ b/configure.in      2012-05-12 00:57:48 +0000
@@ -808,6 +808,7 @@
 dnl checks for programs
 AC_PROG_CPP
 AC_PROG_INSTALL
+AC_PROG_MKDIR_P
 if test "x$RANLIB" = x; then
   AC_PROG_RANLIB
 fi
@@ -1480,10 +1481,8 @@
    fi
    if test $ac_enable_autodepend = yes; then
       DEPFLAGS='-MMD -MF ${DEPDIR}/$*.d -MP'
-      ## In parallel builds, another make might create depdir between
-      ## the first test and mkdir, so stick another test on the end.
-      ## Or use install-sh -d?  mkdir -p is not portable.
-      MKDEPDIR='test -d ${DEPDIR} || mkdir ${DEPDIR} || test -d ${DEPDIR}'
+      ## MKDIR_P is documented (see AC_PROG_MKDIR_P) to be parallel-safe.
+      MKDEPDIR='${MKDIR_P} ${DEPDIR}'
       deps_frag=autodeps.mk
    fi
 fi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-05-10 02:54:07 +0000
+++ b/doc/emacs/ChangeLog       2012-05-12 00:57:48 +0000
@@ -1,3 +1,8 @@
+2012-05-12  Glenn Morris  <address@hidden>
+
+       * Makefile.in (MKDIR_P): New, set by configure.
+       (mkinfodir): Use $MKDIR_P.
+
 2012-05-10  Glenn Morris  <address@hidden>
 
        * mule.texi (Disabling Multibyte): Replace the obsolete "unibyte: t"

=== modified file 'doc/emacs/Makefile.in'
--- a/doc/emacs/Makefile.in     2012-05-04 06:45:03 +0000
+++ b/doc/emacs/Makefile.in     2012-05-12 00:57:48 +0000
@@ -35,6 +35,8 @@
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
+MKDIR_P = @MKDIR_P@
+
 address@hidden@
 # Options used only when making info output.
 # --no-split is only needed because of MS-DOS.
@@ -118,10 +120,8 @@
        $(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
 

=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog   2012-05-09 03:23:20 +0000
+++ b/doc/lispintro/ChangeLog   2012-05-12 00:57:48 +0000
@@ -1,3 +1,8 @@
+2012-05-12  Glenn Morris  <address@hidden>
+
+       * Makefile.in (MKDIR_P): New, set by configure.
+       (mkinfodir): Use $MKDIR_P.
+
 2012-05-05  Glenn Morris  <address@hidden>
 
        * emacs-lisp-intro.texi (Making Errors): Don't mention Emacs 20.

=== modified file 'doc/lispintro/Makefile.in'
--- a/doc/lispintro/Makefile.in 2012-05-04 06:45:03 +0000
+++ b/doc/lispintro/Makefile.in 2012-05-12 00:57:48 +0000
@@ -26,6 +26,8 @@
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
+MKDIR_P = @MKDIR_P@
+
 address@hidden@
 # Options used only when making info output.
 address@hidden@
@@ -39,7 +41,7 @@
 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
 

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-05-10 02:57:10 +0000
+++ b/doc/lispref/ChangeLog     2012-05-12 00:57:48 +0000
@@ -1,3 +1,8 @@
+2012-05-12  Glenn Morris  <address@hidden>
+
+       * Makefile.in (MKDIR_P): New, set by configure.
+       (mkinfodir): Use $MKDIR_P.
+
 2012-05-10  Glenn Morris  <address@hidden>
 
        * loading.texi (Loading Non-ASCII): Replace the obsolete "unibyte: t"

=== modified file 'doc/lispref/Makefile.in'
--- a/doc/lispref/Makefile.in   2012-05-09 03:06:08 +0000
+++ b/doc/lispref/Makefile.in   2012-05-12 00:57:48 +0000
@@ -30,6 +30,8 @@
 # Directory with emacsver.texi.
 emacsdir =  $(srcdir)/../emacs
 
+MKDIR_P = @MKDIR_P@
+
 address@hidden@
 # Options used only when making info output.
 address@hidden@
@@ -99,7 +101,7 @@
   $(srcdir)/gpl.texi \
   $(srcdir)/doclicense.texi
 
-mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
+mkinfodir = @${MKDIR_P} ${infodir}
 
 .PHONY: info dvi pdf ps
 

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-05-07 23:02:28 +0000
+++ b/doc/misc/ChangeLog        2012-05-12 00:57:48 +0000
@@ -1,3 +1,8 @@
+2012-05-12  Glenn Morris  <address@hidden>
+
+       * Makefile.in (MKDIR_P): New, set by configure.
+       (mkinfodir): Use $MKDIR_P.
+
 2012-05-07  Glenn Morris  <address@hidden>
 
        * 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.
 

=== modified file 'doc/misc/Makefile.in'
--- a/doc/misc/Makefile.in      2012-05-04 20:53:03 +0000
+++ b/doc/misc/Makefile.in      2012-05-12 00:57:48 +0000
@@ -38,6 +38,8 @@
 ## Currently only used by efaq and calc.
 emacsdir = $(srcdir)/../emacs
 
+MKDIR_P = @MKDIR_P@
+
 address@hidden@
 # Options used only when making info output.
 address@hidden@
@@ -211,7 +213,7 @@
 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
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-05-11 06:39:26 +0000
+++ b/src/ChangeLog     2012-05-12 00:57:48 +0000
@@ -1,3 +1,8 @@
+2012-05-12  Glenn Morris  <address@hidden>
+
+       * Makefile.in (MKDIR_P): New, set by configure.
+       * ns.mk (${ns_appdir}, ${ns_appbindir}Emacs): Use $MKDIR_P.
+
 2012-05-11  Paul Eggert  <address@hidden>
 
        Remove unused function hourglass_started.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2012-05-01 00:16:02 +0000
+++ b/src/Makefile.in   2012-05-12 00:57:48 +0000
@@ -40,6 +40,7 @@
 # Substitute an assignment for the MAKE variable, because
 # BSD doesn't have it as a default.
 @SET_MAKE@
+MKDIR_P = @MKDIR_P@
 # Don't use LIBS.  configure puts stuff in it that either shouldn't be
 # linked with Emacs or is duplicated by the other stuff below.
 # LIBS = @LIBS@
@@ -284,7 +285,7 @@
 DEPDIR=deps
 ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty.
 address@hidden@
-## test -d $(DEPDIR) || mkdir $(DEPDIR) (if AUTO_DEPEND); else ':'.
+## ${MKDIR_P} ${DEPDIR} (if AUTO_DEPEND); else ':'.
 address@hidden@
 
 ## DO NOT use -R.  There is a special hack described in lastfile.c

=== modified file 'src/ns.mk'
--- a/src/ns.mk 2012-01-05 09:46:05 +0000
+++ b/src/ns.mk 2012-05-12 00:57:48 +0000
@@ -1,6 +1,6 @@
 ### autodeps.mk --- src/Makefile fragment for GNU Emacs
 
-## Copyright (C) 2008-2012  Free Software Foundation, Inc.
+## Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
 
@@ -27,11 +27,11 @@
 
 ${ns_appdir}: ${ns_appsrc}
        rm -fr ${ns_appdir}
-       mkdir -p ${ns_appdir}
+       ${MKDIR_P} ${ns_appdir}
        ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; umask 022; tar 
xf - )
 
 ${ns_appbindir}Emacs: emacs${EXEEXT}
-       mkdir -p ${ns_appbindir}
+       ${MKDIR_P} ${ns_appbindir}
        cp -f emacs${EXEEXT} ${ns_appbindir}Emacs
 
 ns-app: ${ns_appdir} ${ns_appbindir}Emacs