summaryrefslogtreecommitdiff
path: root/leim
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-05-11 21:19:47 -0400
committerGlenn Morris <rgm@gnu.org>2012-05-11 21:19:47 -0400
commit005ad204984f9cc908338e6ce273a5b6c7522183 (patch)
treea3bce5ad7862514412fac3dd59d7b8298b7d1e80 /leim
parent3fe7cdc86d67dd5dcf1ce9d779b20dfec9eafb8d (diff)
downloademacs-005ad204984f9cc908338e6ce273a5b6c7522183.tar.gz
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.
Diffstat (limited to 'leim')
-rw-r--r--leim/ChangeLog5
-rw-r--r--leim/Makefile.in6
2 files changed, 8 insertions, 3 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 85878f65734..560e1d53da6 100644
--- 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 2bf16c0be7e..2d9c9b59481 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 ; \