From 005ad204984f9cc908338e6ce273a5b6c7522183 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 11 May 2012 21:19:47 -0400 Subject: [PATCH] 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. --- leim/ChangeLog | 5 +++++ leim/Makefile.in | 6 +++--- lib-src/ChangeLog | 5 +++++ lib-src/Makefile.in | 5 +++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/leim/ChangeLog b/leim/ChangeLog index 85878f6573..560e1d53da 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,8 @@ +2012-05-12 Glenn Morris + + * Makefile.in (MKDIR_P): New, set by configure. + (install): Use $MKDIR_P. + 2012-05-10 Glenn Morris * Makefile.in: Install self-contained ns files directly to diff --git a/leim/Makefile.in b/leim/Makefile.in index 2bf16c0be7..2d9c9b5948 100644 --- 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 fe00c29cff..aa78c25d1e 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2012-05-12 Glenn Morris + + * Makefile.in (MKDIR_P): New, set by configure. + ($(DESTDIR)${archlibdir}): Use $MKDIR_P. + 2012-05-10 Paul Eggert etags: pacify gcc -Wstack-protector on Ubuntu 12.04 x86 diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 6732030a64..be19b6dc15 100644 --- 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 \ -- 2.20.1