Add option to not create bin/emacs link to bin/emacs-VERSION

* Makefile.in (install-arch-dep): If NO_BIN_LINK is non-null,
do not create the bin/emacs link.

* etc/NEWS: Mention this.

Fixes: debbugs:12011

diff --git a/ChangeLog b/ChangeLog
index 4f339482a989e425c1c0df8fc4f887697b21381f..5657f8bb3aa9976b6dafd3f0a6e6758e955f4aa4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-22  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (install-arch-dep): If NO_BIN_LINK is non-null,
+       do not create the bin/emacs link.  (Bug#12011)
+
 2012-08-21  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from gnulib, incorporating:

diff --git a/Makefile.in b/Makefile.in
index bf4c4b853a02cc01fa0be22666bb9b4f6a01c604..122a35d4416133cf88e96931ca7940b1c1f8046a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -437,8 +437,10 @@ install-arch-dep: install-arch-indep install-doc
        if test "${ns_self_contained}" = "no"; then \
          ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \
          chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ; \
-         rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
-         cd $(DESTDIR)${bindir} && $(LN_S) $(EMACSFULL) $(EMACS); \
+         if test "x${NO_BIN_LINK}" = x; then \
+           rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
+           cd $(DESTDIR)${bindir} && $(LN_S) $(EMACSFULL) $(EMACS); \
+         fi; \
        else \
          subdir=${ns_appresdir}/site-lisp; \
          ${write_subdir} || exit 1; \

diff --git a/etc/NEWS b/etc/NEWS
index fa8a9bd30d02b89632771c1d9401fe258e6b47c9..0c9ffe500938b137dac002801e9e7fc5ad9d9347 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -38,6 +38,11 @@ may be useful.
 ** The configure option '--disable-maintainer-mode' has been removed,
 as it was confusingly-named and rarely useful.
 
+---
+** You can use `NO_BIN_LINK=t make install' to prevent the installation
+overwriting "emacs" in the installation bin/ directory with a link
+to emacs-VERSION.
+
 ---
 ** Emacs uses libtinfo in preference to libncurses, if available.