From 75a9f5f5b690f12e71217af6c18fa931534269ae Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 15 May 2012 13:32:42 -0400 Subject: [PATCH] * Makefile.in (install-arch-dep): Do not hard-code version number. --- ChangeLog | 2 ++ Makefile.in | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 412d4aa5324..f86baa960fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2012-05-15 Glenn Morris + * 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 41a91462edb..7e54ab13e41 100644 --- 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. -- 2.39.2