diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bc18c0eafee..22383088763 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-08-20 Glenn Morris <rgm@gnu.org> + + * Makefile.in (emacs$(EXEEXT), bootstrap-emacs$(EXEEXT)): + Don't assume that `ln -f' works. + 2012-08-20 Eli Zaretskii <eliz@gnu.org> * .gdbinit: Use "set $dummy = ..." to avoid warnings from GDB 7.5 diff --git a/src/Makefile.in b/src/Makefile.in index 4b1520ada62..1d89af31401 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -402,11 +402,13 @@ $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) ## 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 @@ $(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS) 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); \ |