Don't use build-aux/install-sh -d directly

* leim/Makefile.in (MKDIR_P): New, set by configure.
(install): Use $MKDIR_P.

* lib-src/Makefile.in (MKDIR_P): New, set by configure.
($(DESTDIR)${archlibdir}): Use $MKDIR_P.

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 85878f657347da20a8da264d3b8212c6bf927e01..560e1d53da6a53b06d6cfa6800305592876cf244 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-12  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (MKDIR_P): New, set by configure.
+       (install): Use $MKDIR_P.
+
 2012-05-10  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in: Install self-contained ns files directly to

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 2bf16c0be7eb649b373b5ece2e2f9c243068883e..2d9c9b59481840a7f3ca7125d5a2b1bba814a67b 100644 (file)
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -41,6 +41,8 @@ install_prefix=$(DESTDIR)${datadir}/emacs/${version}
 # For self-contained ns builds, it is ${ns_appresdir}/leim.
 LEIM_INSTALLDIR=@LEIM_INSTALLDIR@
 
+MKDIR_P = @MKDIR_P@
+
 GZIP_PROG = @GZIP_PROG@
 
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
@@ -179,9 +181,7 @@ compile-main: ${TIT_MISC}
        done
 
 install: all
-       if [ ! -d ${LEIM_INSTALLDIR} ] ; then \
-          umask 022; ${srcdir}/../build-aux/install-sh -d ${LEIM_INSTALLDIR}; \
-       else true; fi
+       umask 022; ${MKDIR_P} ${LEIM_INSTALLDIR}
        if [ x`(cd ${LEIM_INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \
          rm -f ${LEIM_INSTALLDIR}/leim-list.el; \
          rm -rf ${LEIM_INSTALLDIR}/quail ${LEIM_INSTALLDIR}/ja-dic ; \

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index fe00c29cff70343e4c31727e56bbecd241d71bc7..aa78c25d1e11ac00a33b0abeee7a52ac5c7b7f64 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-12  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (MKDIR_P): New, set by configure.
+       ($(DESTDIR)${archlibdir}): Use $MKDIR_P.
+
 2012-05-10  Paul Eggert  <eggert@cs.ucla.edu>
 
        etags: pacify gcc -Wstack-protector on Ubuntu 12.04 x86

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 6732030a648e005400062ce98e9b80ec756daaf7..be19b6dc15ca3ac544994a93588aeffd6496d717 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -106,6 +106,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 # By default, we uphold the dignity of our programs.
 INSTALL_STRIP =
+MKDIR_P = @MKDIR_P@
 
 # ========================== Lists of Files ===========================
 
@@ -231,13 +232,13 @@ maybe-blessmail: $(BLESSMAIL_TARGET)
 $(DESTDIR)${archlibdir}: all
        @echo
        @echo "Installing utilities run internally by Emacs."
-       umask 022; $(top_srcdir)/build-aux/install-sh -d $(DESTDIR)${archlibdir}
+       umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir}
        if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
          for file in ${UTILITIES}; do \
            $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \
          done ; \
         fi
-       umask 022; $(top_srcdir)/build-aux/install-sh -d $(DESTDIR)${gamedir}; \
+       umask 022; ${MKDIR_P} $(DESTDIR)${gamedir}; \
        touch $(DESTDIR)${gamedir}/snake-scores; \
        touch $(DESTDIR)${gamedir}/tetris-scores
        -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score && chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \