summaryrefslogtreecommitdiff
path: root/nextstep
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2013-09-02 09:01:53 +0200
committerJan Djärv <jan.h.d@swipnet.se>2013-09-02 09:01:53 +0200
commitde3d0b572de7b7c03ba3a2c4153d89e50f411da9 (patch)
treed00c1e501eedaba5d02211f3933279e26c6fc34c /nextstep
parent1fccc5306363a88fc3f663e2a149d0251612d3e9 (diff)
downloademacs-de3d0b572de7b7c03ba3a2c4153d89e50f411da9.tar.gz
Fix copying of nextstep/Emacs.app for make -j install
* configure.ac: Add ns_check_file. * nextstep/Makefile.in (${ns_check_file}): Add so Emacs.app gets properly updated when doing parallel make install.
Diffstat (limited to 'nextstep')
-rw-r--r--nextstep/ChangeLog5
-rw-r--r--nextstep/Makefile.in5
2 files changed, 8 insertions, 2 deletions
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 7e5e7b520dd..42086ec1007 100644
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-02 Jan Djärv <jan.h.d@swipnet.se>
+
+ * Makefile.in (${ns_check_file}): Add so Emacs.app gets properly
+ updated when doing parallel make install.
+
2013-08-28 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in
index 8e768f70043..3d80ddb7ad2 100644
--- a/nextstep/Makefile.in
+++ b/nextstep/Makefile.in
@@ -31,8 +31,9 @@ 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 - . ) | \
@@ -42,7 +43,7 @@ ${ns_appdir}: ${srcdir}/${ns_appsrc} ${ns_appsrc}
( cd ${ns_appdir} ; umask 022; tar xf - )
touch ${ns_appdir}
-${ns_appbindir}/Emacs: ${ns_appdir} ../src/emacs${EXEEXT}
+${ns_appbindir}/Emacs: ${ns_appdir} ${ns_check_file} ../src/emacs${EXEEXT}
${MKDIR_P} ${ns_appbindir}
cp -f ../src/emacs${EXEEXT} ${ns_appbindir}/Emacs