[Emacs-diffs] emacs/leim Makefile.in

[Jan Djärv]

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

Modified files:
        leim           : Makefile.in 

Log message:
        (install): Remove old directories in ns_appresdir before
        moving new directories there.

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

Patches:
Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/leim/Makefile.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- Makefile.in 17 Jul 2008 18:14:14 -0000      1.95
+++ Makefile.in 30 Dec 2008 20:13:38 -0000      1.96
@@ -220,6 +220,8 @@
        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 @@
        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