[Emacs-diffs] master d2fab6b: fix last patch

[Sam Steingold]

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

    fix last patch
    
    * nextstep/Makefile.in (links): Use abs_top_builddir et al; link over DOC.
---
 nextstep/ChangeLog   |    4 ++++
 nextstep/Makefile.in |   23 +++++++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 8b44d5c..3f731a5 100644
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-05  Sam Steingold  <address@hidden>
+
+       * Makefile.in (links): Use abs_top_builddir et al; link over DOC.
+
 2014-12-03  Sam Steingold  <address@hidden>
 
        * Makefile.in (links): New phony target to create a fake
diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in
index c07fe85..3bf1f5b 100644
--- a/nextstep/Makefile.in
+++ b/nextstep/Makefile.in
@@ -23,8 +23,13 @@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
+abs_builddir = @abs_builddir@
+abs_top_builddir = @abs_top_builddir@
 EXEEXT = @EXEEXT@
 
+# abs_top_srcdir may contain ".."
+top_srcdir_abs = $(shell cd @top_srcdir@; pwd -P)
+
 @SET_MAKE@
 MKDIR_P = @MKDIR_P@
 
@@ -58,15 +63,17 @@ all: ${ns_appdir} ${ns_appbindir}/Emacs
 # to run GUI Emacs in-place
 links : ../src/emacs${EXEEXT} | ${ns_appbindir}
        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 f in $(shell cd ${srcdir}/${ns_appsrc}; find . -type f); do ln -s 
$(abs_builddir)/${ns_appsrc}/$$f ${ns_appdir}; 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 pwd 
-P)/${ns_appsrc}/$$f ${ns_appdir}/$$f; done
-       ln -s ../../../../../lisp ${ns_appdir}/Contents/Resources
-       ln -s ../../../../../etc ${ns_appdir}/Contents/Resources
-       ln -s ../../../../../info ${ns_appdir}/Contents/Resources
-       ln -s ../../../../src/emacs${EXEEXT} ${ns_appbindir}/Emacs
-       ln -s ../../../../lib-src ${ns_appbindir}/bin
-       ln -s ../../../../lib-src ${ns_appbindir}/libexec
+       for f in $(shell cd ${ns_appsrc}; find . -type f); do ln -s $(shell pwd 
-P)/${ns_appsrc}/$$f ${ns_appdir}; done
+       ln -s $(top_srcdir_abs)/lisp ${ns_appdir}/Contents/Resources
+       ln -s $(top_srcdir_abs)/info ${ns_appdir}/Contents/Resources
+       ln -s $(abs_top_builddir)/src/emacs${EXEEXT} ${ns_appbindir}/Emacs
+       ln -s $(abs_top_builddir)/lib-src ${ns_appbindir}/bin
+       ln -s $(abs_top_builddir)/lib-src ${ns_appbindir}/libexec
+       ${MKDIR_P} ${ns_appdir}/Contents/Resources/etc
+       for f in $(shell cd $(top_srcdir_abs)/etc; ls); do ln -s 
$(top_srcdir_abs)/etc/$$f ${ns_appdir}/Contents/Resources/etc; done
+       ln -s $(abs_top_builddir)/etc/DOC ${ns_appdir}/Contents/Resources/etc
 
 .PHONY: clean distclean bootstrap-clean maintainer-clean