From: Glenn Morris <rgm@gnu.org>
Date: Wed, 22 Aug 2012 06:55:44 +0000 (-0700)
Subject: Add option to not create bin/emacs link to bin/emacs-VERSION
X-Git-Tag: emacs-24.2.90~549
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5af9cb6be0db0d830fe98e0370e4cca1a54ccfbd;p=emacs.git

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 4f339482a98..5657f8bb3aa 100644
--- 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 bf4c4b853a0..122a35d4416 100644
--- 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 fa8a9bd30d0..0c9ffe50093 100644
--- 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.