Merge from trunk

2 files changed, 5 insertions, 1 deletions

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 7334fa991c9..08da90c2aa8 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-23  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (install): Use `install-sh -d' rather than mkinstalldirs.
+
 2011-02-28  Juanma Barranquero  <lekktu@gmail.com>
 
         * quail/ethiopic.el ("ethiopic"): Fix tpo in docstring.
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 8c2baadf15f..531f0481f7a 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -220,7 +220,7 @@ MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done
 
 install: all
         if [ ! -d ${INSTALLDIR} ] ; then \
-          umask 022; ${srcdir}/../mkinstalldirs ${INSTALLDIR}; \
+          umask 022; ${srcdir}/../install-sh -d ${INSTALLDIR}; \
         else true; fi
         if [ x`(cd ${INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \
           rm -f ${INSTALLDIR}/leim-list.el; \