Merge from mainline.

2 files changed, 14 insertions, 3 deletions

diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index d76d832555c..42086ec1007 100644
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,13 @@
+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,
+        for portability to hosts where /bin/sh has problems.
+
 2013-06-02  Jan Djärv  <jan.h.d@swipnet.se>
 
         * templates/Info-gnustep.plist.in: Add NSDocumentClass EmacsDocument.
diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in
index feeafc0d694..3d80ddb7ad2 100644
--- a/nextstep/Makefile.in
+++ b/nextstep/Makefile.in
@@ -20,7 +20,7 @@
 ### Commentary:
 
 ### Code:
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 EXEEXT = @EXEEXT@
@@ -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