[Emacs-diffs] /srv/bzr/emacs/trunk r109740: Add option to not create bin/emacs link to bin/emacs-VERSION

[Glenn Morris]

------------------------------------------------------------
revno: 109740
fixes bug: http://debbugs.gnu.org/12011
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-08-21 23:55:44 -0700
message:
  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.
modified:
  ChangeLog
  Makefile.in
  etc/NEWS

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-08-21 14:37:56 +0000
+++ b/ChangeLog 2012-08-22 06:55:44 +0000
@@ -1,3 +1,8 @@
+2012-08-22  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        Merge from gnulib, incorporating:

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-08-20 22:12:35 +0000
+++ b/Makefile.in       2012-08-22 06:55:44 +0000
@@ -437,8 +437,10 @@
        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; \

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-08-18 05:11:38 +0000
+++ b/etc/NEWS  2012-08-22 06:55:44 +0000
@@ -39,6 +39,11 @@
 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.
 
 ---