[Emacs-diffs] master 9ce10e8: ns_appsrc is not disjoint with srcdir/ns_appsrc

[Sam Steingold]

branch: master
commit 9ce10e893dcdec1a5d3d7ef985408b79cd5ecd69
Author: Sam Steingold <address@hidden>
Commit: Sam Steingold <address@hidden>

    ns_appsrc is not disjoint with srcdir/ns_appsrc
    
    (links): Avoid "file already exists" errors
    by removing the existing file.
---
 nextstep/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in
index 0763e63..cb69898 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}