From 9c2224013b406a4889b4af6e6445acfa89fe67db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Tue, 30 Dec 2008 20:13:28 +0000 Subject: [PATCH] (install-arch-dep): Remove old directories in ns_app* before moving new directories there. --- ChangeLog | 5 +++++ Makefile.in | 9 ++++++--- leim/ChangeLog | 5 +++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29cdff04693..e69f63b7b97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-12-30 Jan Djärv + + * Makefile.in (install-arch-dep): Remove old directories in + ns_app* before moving new directories there. + 2008-12-27 Dan Nicolaescu * .dir-locals.el: Remove non-working entry for pmail. diff --git a/Makefile.in b/Makefile.in index 9d26595eed3..8425867ef29 100644 --- a/Makefile.in +++ b/Makefile.in @@ -393,6 +393,8 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS) install: all install-arch-indep install-arch-dep install-leim blessmail @true +MV_DIRS = for i in $$dir; do rm -fr $$(basename "$$i") ; mv "$$i" . ; done + ### Install the executables that were compiled specifically for this machine. ### It would be nice to do something for a parallel make ### to ensure that install-arch-indep finishes before this starts. @@ -414,10 +416,11 @@ install-arch-dep: mkdir done if test "${ns_appdir}" != ""; then \ ( cd ${ns_appresdir} ; \ - if test -d share/emacs ; then mv -f share/emacs/*/* . ; fi ; \ - if test -d share/info ; then mv -f share/info . ; fi ; \ + if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ + if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \ rm -fr share ) ; \ - ( cd ${ns_appbindir}/libexec ; mv -f emacs/*/*/* . ; rm -fr emacs ) ; \ + ( cd ${ns_appbindir}/libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \ + rm -fr emacs ) ; \ ( cd ${ns_appbindir}/bin ; rm -f emacs emacs-23* ; \ ln -sf ../libexec/* .) ; \ else true ; fi diff --git a/leim/ChangeLog b/leim/ChangeLog index dd8cf67dc24..580ba9f0c2c 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,8 @@ +2008-12-30 Jan Djärv + + * Makefile.in (install): Remove old directories in ns_appresdir before + moving new directories there. + 2008-11-11 Juanma Barranquero * quail/hangul.el (hangul-im-keymap, hangul-insert-character) -- 2.39.2