Merge from origin/emacs-24

[gnu-emacs] / nextstep / Makefile.in

diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in
index 8e768f70043fc8547fd1ce116c98212f472c33c6..07e7285924a7d90b4e1be6ee3e2a5dfb3463b7f6 100644 (file)
--- a/nextstep/Makefile.in
+++ b/nextstep/Makefile.in
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-## Copyright (C) 2012-2013 Free Software Foundation, Inc.
+## Copyright (C) 2012-2015 Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
 
@@ -8,12 +8,12 @@
 ## it under the terms of the GNU General Public License as published by
 ## the Free Software Foundation, either version 3 of the License, or
 ## (at your option) any later version.
-## 
+##
 ## GNU Emacs is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
-## 
+##
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -23,35 +23,61 @@
 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@
 
 ns_appdir = @ns_appdir@
 ns_appbindir = @ns_appbindir@
 ns_appsrc = @ns_appsrc@
+ns_check_file = @ns_appdir@/@ns_check_file@
 
-${ns_appdir}: ${srcdir}/${ns_appsrc} ${ns_appsrc}
+${ns_check_file} ${ns_appdir}: ${srcdir}/${ns_appsrc} ${ns_appsrc}
        rm -rf ${ns_appdir}
        ${MKDIR_P} ${ns_appdir}
        ( cd ${srcdir}/${ns_appsrc} ; tar cfh - . ) | \
          ( cd ${ns_appdir} ; umask 022; tar xf - )
-       [ `cd ${srcdir} && /bin/pwd` = `/bin/pwd` ] || \
+       [ "`cd ${srcdir} && /bin/pwd`" = "`/bin/pwd`" ] || \
          ( cd ${ns_appsrc} ; tar cfh - . ) | \
            ( cd ${ns_appdir} ; umask 022; tar xf - )
        touch ${ns_appdir}
 
-${ns_appbindir}/Emacs: ${ns_appdir} ../src/emacs${EXEEXT}
-       ${MKDIR_P} ${ns_appbindir}
-       cp -f ../src/emacs${EXEEXT} ${ns_appbindir}/Emacs
+${ns_appbindir}:
+       ${MKDIR_P} $@
 
-.PHONY: all
+${ns_appbindir}/Emacs: ${ns_appdir} ${ns_check_file} ../src/emacs${EXEEXT} | \
+  ${ns_appbindir}
+       cp -f ../src/emacs${EXEEXT} $@
 
-all: ${ns_appdir} ${ns_appbindir}/Emacs
+.PHONY: all links
 
+all: ${ns_appdir} ${ns_appbindir}/Emacs
 
-.PHONY: clean distclean maintainer-clean
+# create a fake installation pointing back to the source tree
+# 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 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
+       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
+       @echo if the next find prints something, the installation failed
+       find ${ns_appdir} -exec test \! -e {} \; -ls
+
+.PHONY: clean distclean bootstrap-clean maintainer-clean
 
 clean:
        rm -rf ${ns_appdir}
@@ -63,6 +89,6 @@ distclean: clean
          Cocoa/Emacs.base/Contents/Info.plist \
          Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
 
-maintainer-clean: distclean
+bootstrap-clean maintainer-clean: distclean
 
 ### Makefile.in ends here