[Emacs-diffs] /srv/bzr/emacs/trunk r108202: Don't use build-aux/install-sh -d directly

[Glenn Morris]

------------------------------------------------------------
revno: 108202
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-05-11 21:19:47 -0400
message:
  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.
modified:
  leim/ChangeLog
  leim/Makefile.in
  lib-src/ChangeLog
  lib-src/Makefile.in

=== modified file 'leim/ChangeLog'
--- a/leim/ChangeLog    2012-05-10 03:40:20 +0000
+++ b/leim/ChangeLog    2012-05-12 01:19:47 +0000
@@ -1,3 +1,8 @@
+2012-05-12  Glenn Morris  <address@hidden>
+
+       * Makefile.in (MKDIR_P): New, set by configure.
+       (install): Use $MKDIR_P.
+
 2012-05-10  Glenn Morris  <address@hidden>
 
        * Makefile.in: Install self-contained ns files directly to

=== modified file 'leim/Makefile.in'
--- a/leim/Makefile.in  2012-05-10 03:40:20 +0000
+++ b/leim/Makefile.in  2012-05-12 01:19:47 +0000
@@ -41,6 +41,8 @@
 # For self-contained ns builds, it is ${ns_appresdir}/leim.
 address@hidden@
 
+MKDIR_P = @MKDIR_P@
+
 GZIP_PROG = @GZIP_PROG@
 
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
@@ -179,9 +181,7 @@
        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 ; \

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-05-10 00:27:32 +0000
+++ b/lib-src/ChangeLog 2012-05-12 01:19:47 +0000
@@ -1,3 +1,8 @@
+2012-05-12  Glenn Morris  <address@hidden>
+
+       * Makefile.in (MKDIR_P): New, set by configure.
+       ($(DESTDIR)${archlibdir}): Use $MKDIR_P.
+
 2012-05-10  Paul Eggert  <address@hidden>
 
        etags: pacify gcc -Wstack-protector on Ubuntu 12.04 x86

=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in       2012-04-09 07:45:59 +0000
+++ b/lib-src/Makefile.in       2012-05-12 01:19:47 +0000
@@ -106,6 +106,7 @@
 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 @@
 $(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 \