diff options
| author | Jan Djärv | 2008-12-30 20:13:38 +0000 |
|---|---|---|
| committer | Jan Djärv | 2008-12-30 20:13:38 +0000 |
| commit | 3fef330a88cc6617ac266b1077ada85fdd765996 (patch) | |
| tree | 8619b2f9f21c58ec3f904694670dcc76657ae138 | |
| parent | 9c2224013b406a4889b4af6e6445acfa89fe67db (diff) | |
| download | emacs-3fef330a88cc6617ac266b1077ada85fdd765996.tar.gz emacs-3fef330a88cc6617ac266b1077ada85fdd765996.zip | |
(install): Remove old directories in ns_appresdir before
moving new directories there.
| -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 | |||
| 220 | fi | 220 | fi |
| 221 | sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@ | 221 | sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@ |
| 222 | 222 | ||
| 223 | MV_DIRS = for i in $$dir; do rm -fr $$(basename "$$i") ; mv "$$i" . ; done | ||
| 224 | |||
| 223 | install: all | 225 | install: all |
| 224 | if [ ! -d ${INSTALLDIR} ] ; then \ | 226 | if [ ! -d ${INSTALLDIR} ] ; then \ |
| 225 | ${srcdir}/${dot}${dot}/mkinstalldirs ${INSTALLDIR}; \ | 227 | ${srcdir}/${dot}${dot}/mkinstalldirs ${INSTALLDIR}; \ |
| @@ -262,7 +264,7 @@ install: all | |||
| 262 | find ${INSTALLDIR} -exec chown $${installuser} '{}' ';' | 264 | find ${INSTALLDIR} -exec chown $${installuser} '{}' ';' |
| 263 | if [ "${ns_appresdir}" != "" ]; then \ | 265 | if [ "${ns_appresdir}" != "" ]; then \ |
| 264 | ( cd ${ns_appresdir} ; \ | 266 | ( cd ${ns_appresdir} ; \ |
| 265 | if test -d share/emacs ; then mv -f share/emacs/*/* . ; fi ; \ | 267 | if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ |
| 266 | rm -fr share ) ; \ | 268 | rm -fr share ) ; \ |
| 267 | else true ; fi | 269 | else true ; fi |
| 268 | 270 | ||