From 9aa0092cdd378dd8f7a55896c31bb68d2be18b1c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 20 Aug 2012 18:12:35 -0400 Subject: [PATCH] Use symlink in installed bin/ directory, where supported * configure.ac (AC_PROG_LN_S): Test for ln. * Makefile.in (LN_S): New, set by configure. (install-arch-dep): Use $LN_S. --- ChangeLog | 6 ++++++ Makefile.in | 3 ++- configure.ac | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4a531145e20..16afbdd3c99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-08-20 Glenn Morris + + * configure.ac (AC_PROG_LN_S): Test for ln. + * Makefile.in (LN_S): New, set by configure. + (install-arch-dep): Use $LN_S. + 2012-08-19 Paul Eggert Merge from gnulib, incorporating: diff --git a/Makefile.in b/Makefile.in index ab9f16c0353..bf4c4b853a0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -246,6 +246,7 @@ INSTALL_INFO = @INSTALL_INFO@ # By default, we uphold the dignity of our programs. INSTALL_STRIP = MKDIR_P = @MKDIR_P@ +LN_S = @LN_S@ # We use gzip to compress installed .el files. GZIP_PROG = @GZIP_PROG@ @@ -437,7 +438,7 @@ install-arch-dep: install-arch-indep install-doc ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \ chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ; \ rm -f $(DESTDIR)${bindir}/$(EMACS) ; \ - ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) || true ; \ + cd $(DESTDIR)${bindir} && $(LN_S) $(EMACSFULL) $(EMACS); \ else \ subdir=${ns_appresdir}/site-lisp; \ ${write_subdir} || exit 1; \ diff --git a/configure.ac b/configure.ac index 2394790c455..b10cb24bab6 100644 --- a/configure.ac +++ b/configure.ac @@ -731,6 +731,7 @@ dnl AC_PROG_MKDIR_P dnl if test "x$RANLIB" = x; then dnl AC_PROG_RANLIB dnl fi +AC_PROG_LN_S AC_PATH_PROG(INSTALL_INFO, install-info, :, $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin) -- 2.39.5