* Makefile.in (install-arch-dep): Do not hard-code version number.

diff --git a/ChangeLog b/ChangeLog
index 412d4aa532411fcf916e572928e330c694518f53..f86baa960fca1ab6b17de3b2c3640628c018ecdf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-05-15  Glenn Morris  <rgm@gnu.org>
 
+       * Makefile.in (install-arch-dep): Do not hard-code version number.
+
        * Makefile.in (install-arch-dep): NS install no longer needs to
        symlink libexec/* into bin/, since 2012-05-14 ns_init_paths change.
 

diff --git a/Makefile.in b/Makefile.in
index 41a91462edb4f2ddf899b19519f901bb97dcb274..7e54ab13e4108d39a4f75d217e2b544fea45b464 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -475,14 +475,13 @@ install-arch-dep: mkdir
            rm -fr share ) ; \
          ( cd ${ns_appbindir} ; \
            if cd libexec ; then dir=emacs/*/*/* ; $(MV_DIRS); \
-           rm -fr emacs; if cd ../bin; then rm -f emacs emacs-24*; \
-           fi ; fi ) ; \
+           rm -fr emacs; rm -f ../bin/emacs ../bin/$(EMACSFULL) ; \
+           fi ) ; \
        else true ; fi
 
-## FIXME is the emacs-24* bit above really necessary and correct?
-## What if I have 24.1 and 24.2 installed at the same time?
-## In any case, it should use something like echo $version | sed 's/\..*//'
-## instead of hard-coding a version.
+## FIXME NS self-contained: rather than installing emacs and
+## EMACSFULL, then deleting them, obviously it would be better to not
+## install them in the first place.
 
 ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
 ## Needs to be the user running install, so configure can't set it.