1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-16 17:19:41 +00:00

fix last patch

* nextstep/Makefile.in (links): Use abs_top_builddir et al; link over DOC.
This commit is contained in:
Sam Steingold 2014-12-05 10:31:25 -05:00
parent 9c72233e63
commit d2fab6bf58
2 changed files with 19 additions and 8 deletions

View File

@ -1,3 +1,7 @@
2014-12-05 Sam Steingold <sds@gnu.org>
* Makefile.in (links): Use abs_top_builddir et al; link over DOC.
2014-12-03 Sam Steingold <sds@gnu.org> 2014-12-03 Sam Steingold <sds@gnu.org>
* Makefile.in (links): New phony target to create a fake * Makefile.in (links): New phony target to create a fake

View File

@ -23,8 +23,13 @@
SHELL = @SHELL@ SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
abs_builddir = @abs_builddir@
abs_top_builddir = @abs_top_builddir@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
# abs_top_srcdir may contain ".."
top_srcdir_abs = $(shell cd @top_srcdir@; pwd -P)
@SET_MAKE@ @SET_MAKE@
MKDIR_P = @MKDIR_P@ MKDIR_P = @MKDIR_P@
@ -58,15 +63,17 @@ all: ${ns_appdir} ${ns_appbindir}/Emacs
# to run GUI Emacs in-place # to run GUI Emacs in-place
links : ../src/emacs${EXEEXT} | ${ns_appbindir} 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 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 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 for f in $(shell cd ${ns_appsrc}; find . -type f); do ln -s $(shell pwd -P)/${ns_appsrc}/$$f ${ns_appdir}; done
ln -s ../../../../../lisp ${ns_appdir}/Contents/Resources ln -s $(top_srcdir_abs)/lisp ${ns_appdir}/Contents/Resources
ln -s ../../../../../etc ${ns_appdir}/Contents/Resources ln -s $(top_srcdir_abs)/info ${ns_appdir}/Contents/Resources
ln -s ../../../../../info ${ns_appdir}/Contents/Resources ln -s $(abs_top_builddir)/src/emacs${EXEEXT} ${ns_appbindir}/Emacs
ln -s ../../../../src/emacs${EXEEXT} ${ns_appbindir}/Emacs ln -s $(abs_top_builddir)/lib-src ${ns_appbindir}/bin
ln -s ../../../../lib-src ${ns_appbindir}/bin ln -s $(abs_top_builddir)/lib-src ${ns_appbindir}/libexec
ln -s ../../../../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 .PHONY: clean distclean bootstrap-clean maintainer-clean