[Emacs-diffs] emacs Makefile.in

[Jan Djärv]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd>        08/12/30 20:13:04

Modified files:
        .              : Makefile.in 

Log message:
        (install-arch-dep): Remove old directories in
        ns_app* before moving new directories there.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/Makefile.in?cvsroot=emacs&r1=1.367&r2=1.368

Patches:
Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/Makefile.in,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -b -r1.367 -r1.368
--- Makefile.in 13 Dec 2008 20:53:02 -0000      1.367
+++ Makefile.in 30 Dec 2008 20:13:04 -0000      1.368
@@ -393,6 +393,8 @@
 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 @@
        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