(install): Remove old directories in ns_appresdir before

moving new directories there.

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 731f0d5..b86ee3c 100644 (file)
--- 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