[Emacs-diffs] /srv/bzr/emacs/trunk r109705: * src/Makefile.in: Don't assume that `ln -f' works.

[Glenn Morris]

------------------------------------------------------------
revno: 109705
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-08-20 19:57:35 -0400
message:
  * src/Makefile.in: Don't assume that `ln -f' works.
  Presumably it does work fine on all platforms currently building
  Emacs, but the autoconf manual says not to rely on it.
modified:
  src/ChangeLog
  src/Makefile.in

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-20 17:32:31 +0000
+++ b/src/ChangeLog     2012-08-20 23:57:35 +0000
@@ -1,3 +1,8 @@
+2012-08-20  Glenn Morris  <address@hidden>
+
+       * Makefile.in (emacs$(EXEEXT), bootstrap-emacs$(EXEEXT)):
+       Don't assume that `ln -f' works.
+
 2012-08-20  Eli Zaretskii  <address@hidden>
 
        * .gdbinit: Use "set $dummy = ..." to avoid warnings from GDB 7.5

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2012-08-10 00:47:21 +0000
+++ b/src/Makefile.in   2012-08-20 23:57:35 +0000
@@ -402,11 +402,13 @@
 ## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here.
 emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) $(leimdir)/leim-list.el
        if test "$(CANNOT_DUMP)" = "yes"; then \
-         ln -f temacs$(EXEEXT) emacs$(EXEEXT); \
+         rm -f emacs$(EXEEXT); \
+         ln temacs$(EXEEXT) emacs$(EXEEXT); \
        else \
          LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \
          test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \
-         ln -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
+         rm -f bootstrap-emacs$(EXEEXT); \
+         ln emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
        fi
 
 ## We run make-docfile twice because the command line may get too long
@@ -600,7 +602,8 @@
 bootstrap-emacs$(EXEEXT): temacs$(EXEEXT)
        cd ../lisp; $(MAKE) $(MFLAGS) update-subdirs
        if test "$(CANNOT_DUMP)" = "yes"; then \
-         ln -f temacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
+         rm -f bootstrap-emacs$(EXEEXT); \
+         ln temacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
        else \
          $(RUN_TEMACS) --batch --load loadup bootstrap || exit 1; \
          test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \