[Emacs-diffs] /srv/bzr/emacs/trunk r108245: * Makefile.in (install-arch-dep): Replace last user of MV_DIRS.

[Glenn Morris]

------------------------------------------------------------
revno: 108245
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-05-15 15:13:17 -0400
message:
  * Makefile.in (install-arch-dep): Replace last user of MV_DIRS.
modified:
  ChangeLog
  Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-15 17:55:39 +0000
+++ b/ChangeLog 2012-05-15 19:13:17 +0000
@@ -1,7 +1,6 @@
 2012-05-15  Glenn Morris  <address@hidden>
 
-       * Makefile.in (install-arch-dep): Replace use of MV_DIRS with info,
-       and with libexec.
+       * Makefile.in (install-arch-dep): Replace use of MV_DIRS.
 
        * Makefile.in (install-arch-dep): Do not hard-code version number.
 

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-05-15 17:55:39 +0000
+++ b/Makefile.in       2012-05-15 19:13:17 +0000
@@ -451,8 +451,6 @@
 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.
@@ -470,7 +468,9 @@
        -ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS)
        if test "${ns_appresdir}" != ""; then \
          ( cd ${ns_appresdir} ; \
-           if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
+           if test -d share/emacs ; then \
+             for dir in share/emacs/${version}/*; do \
+               rm -fr `basename "$$dir"`; mv "$$dir" . ; done; fi ; \
            if test -d share/info ; then rm -fr info; mv share/info . ; fi ; \
            rm -fr share ) ; \
          ( if cd ${ns_appbindir}/libexec ; then \