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
This commit is contained in:
parent
2b2c07948e
commit
5af9cb6be0
3 changed files with 14 additions and 2 deletions
|
@ -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:
|
||||
|
|
|
@ -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; \
|
||||
|
|
5
etc/NEWS
5
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.
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue