From: Glenn Morris <rgm@gnu.org>
Date: Tue, 15 May 2012 17:55:39 +0000 (-0400)
Subject: * Makefile.in (install-arch-dep): Replace use of MV_DIRS with libexec.
X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/c184265d03d96294322572159414d95cc416b790

* Makefile.in (install-arch-dep): Replace use of MV_DIRS with libexec.
---

diff --git a/ChangeLog b/ChangeLog
index b1aed06bbb..0c92193488 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2012-05-15  Glenn Morris  <rgm@gnu.org>
 
-	* Makefile.in (install-arch-dep): Replace use of MV_DIRS with info.
+	* Makefile.in (install-arch-dep): Replace use of MV_DIRS with info,
+	and with libexec.
 
 	* Makefile.in (install-arch-dep): Do not hard-code version number.
 
diff --git a/Makefile.in b/Makefile.in
index 5237076b77..0b1fb77e6d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -473,9 +473,9 @@ install-arch-dep: mkdir
 	    if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
 	    if test -d share/info ; then rm -fr info; mv share/info . ; fi ; \
 	    rm -fr share ) ; \
-	  ( cd ${ns_appbindir} ; \
-	    if cd libexec ; then dir=emacs/*/*/* ; $(MV_DIRS); \
-	    rm -fr emacs; rm -f ../bin/emacs ../bin/$(EMACSFULL) ; \
+	  ( if cd ${ns_appbindir}/libexec ; then \
+	      mv -f emacs/${version}/${configuration}/* . ; rm -fr emacs ; \
+	      rm -f ../bin/emacs ../bin/$(EMACSFULL) ; \
 	    fi ) ; \
 	else true ; fi