From: Sam Steingold <sds@gnu.org>
Date: Tue, 20 Feb 2018 16:18:24 +0000 (-0500)
Subject: ns_appsrc is not disjoint with srcdir/ns_appsrc
X-Git-Tag: emacs-27.0.90~5657
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9ce10e893dcdec1a5d3d7ef985408b79cd5ecd69;p=emacs.git

ns_appsrc is not disjoint with srcdir/ns_appsrc

(links): Avoid "file already exists" errors
by removing the existing file.
---

diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in
index 0763e63f930..cb698987374 100644
--- a/nextstep/Makefile.in
+++ b/nextstep/Makefile.in
@@ -76,7 +76,7 @@ links: ../src/emacs${EXEEXT}
 	for d in $(shell cd ${srcdir}/${ns_appsrc}; find . -type d); do ${MKDIR_P} ${ns_appdir}/$$d; done
 	for f in $(shell cd ${srcdir}/${ns_appsrc}; find . -type f); do ln -s $(shell cd ${srcdir}; pwd -P)/${ns_appsrc}/$$f ${ns_appdir}/$$f; done
 	for d in $(shell cd ${ns_appsrc}; find . -type d); do ${MKDIR_P} ${ns_appdir}/$$d; done
-	for f in $(shell cd ${ns_appsrc}; find . -type f); do ln -s $(shell cd ${ns_appsrc}; pwd -P)/$$f ${ns_appdir}/$$f; done
+	for f in $(shell cd ${ns_appsrc}; find . -type f); do rm -f ${ns_appdir}/$$f; ln -s $(shell cd ${ns_appsrc}; pwd -P)/$$f ${ns_appdir}/$$f; done
 	ln -s $(top_srcdir_abs)/lisp ${ns_appdir}/Contents/Resources
 	ln -s $(top_srcdir_abs)/info ${ns_appdir}/Contents/Resources
 	${MKDIR_P} ${ns_appbindir}