diff options
author | Jan Djärv <jan.h.d@swipnet.se> | 2008-12-30 20:13:38 +0000 |
---|---|---|
committer | Jan Djärv <jan.h.d@swipnet.se> | 2008-12-30 20:13:38 +0000 |
commit | 95c15eb4a1fd5bd141785869ba218ef663b7d489 (patch) | |
tree | 207f5c97f522975388e7683615d7766849756b36 /leim | |
parent | df1be5c1cc9990b7c6ef33c30aa562f575cce500 (diff) | |
download | emacs-95c15eb4a1fd5bd141785869ba218ef663b7d489.tar.gz |
(install): Remove old directories in ns_appresdir before
moving new directories there.
Diffstat (limited to 'leim')
-rw-r--r-- | leim/Makefile.in | 4 |
1 files changed, 3 insertions, 1 deletions
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 |