From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 30 Dec 2008 20:13:38 +0000 (+0000)
Subject: (install): Remove old directories in ns_appresdir before
X-Git-Tag: emacs-pretest-23.0.90~793
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3fef330a88cc6617ac266b1077ada85fdd765996;p=emacs.git

(install): Remove old directories in ns_appresdir before
moving new directories there.
---

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 731f0d55312..b86ee3cc000 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -220,6 +220,8 @@ leim-list.el: ${SUBDIRS} ${TIT-MISC} changed.tit changed.misc ${srcdir}/leim-ext
 	fi
 	sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@
 
+MV_DIRS = for i in $$dir; do rm -fr $$(basename "$$i") ; mv "$$i" . ; done
+
 install: all
 	if [ ! -d ${INSTALLDIR} ] ; then \
           ${srcdir}/${dot}${dot}/mkinstalldirs ${INSTALLDIR}; \
@@ -262,7 +264,7 @@ install: all
 	find ${INSTALLDIR} -exec chown $${installuser} '{}' ';'
 	if [ "${ns_appresdir}" != "" ]; then \
 	  ( cd ${ns_appresdir} ; \
-	    if test -d share/emacs ; then mv -f share/emacs/*/* . ; fi ; \
+	    if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
 	    rm -fr share ) ; \
 	else true ; fi