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.

diff --git a/ChangeLog b/ChangeLog
index 4a531145e2067ca4ce1720d665901c17215130d1..16afbdd3c99bac31cbe368e8ad6c0a70449f2df3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-20  Glenn Morris  <rgm@gnu.org>
+
+       * 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  <eggert@cs.ucla.edu>
 
        Merge from gnulib, incorporating:

diff --git a/Makefile.in b/Makefile.in
index ab9f16c0353a85a4e5040da3269685345a21ac29..bf4c4b853a02cc01fa0be22666bb9b4f6a01c604 100644 (file)
--- 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 2394790c455da5912e7b50a1a8c91f5aa53eca27..b10cb24bab67044160a1105c85c1669a913155bf 100644 (file)
--- 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)