(install-arch-dep): Remove old directories in

ns_app* before moving new directories there.

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  <jan.h.d@swipnet.se>
+
+        * Makefile.in (install-arch-dep): Remove old directories in
+        ns_app* before moving new directories there.
+
 2008-12-27  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * .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  <jan.h.d@swipnet.se>
+
+        * Makefile.in (install): Remove old directories in ns_appresdir before
+        moving new directories there.
+
 2008-11-11  Juanma Barranquero  <lekktu@gmail.com>
 
         * quail/hangul.el (hangul-im-keymap, hangul-insert-character)