[Emacs-diffs] /srv/bzr/emacs/trunk r109704: Use symlink in installed bin/ directory, where supported

[Glenn Morris]

------------------------------------------------------------
revno: 109704
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-08-20 18:12:35 -0400
message:
  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.
modified:
  ChangeLog
  Makefile.in
  configure.ac

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-08-19 23:31:24 +0000
+++ b/ChangeLog 2012-08-20 22:12:35 +0000
@@ -1,3 +1,9 @@
+2012-08-20  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        Merge from gnulib, incorporating:

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-07-31 07:58:08 +0000
+++ b/Makefile.in       2012-08-20 22:12:35 +0000
@@ -246,6 +246,7 @@
 # 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_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; \

=== modified file 'configure.ac'
--- a/configure.ac      2012-08-17 07:23:21 +0000
+++ b/configure.ac      2012-08-20 22:12:35 +0000
@@ -731,6 +731,7 @@
 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)