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.

diff --git a/ChangeLog b/ChangeLog
index 14bac06..ba6c22c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * configure.ac: Add ns_check_file.
+
 2013-08-31  Glenn Morris  <rgm@gnu.org>
 
        * configure.ac (--with-sound): Rename ossaudio to bsd-ossaudio,

diff --git a/configure.ac b/configure.ac
index 6cafa3e..2d12a8f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4897,10 +4897,13 @@ if test "$HAVE_NS" = "yes"; then
   if test "$NS_IMPL_GNUSTEP" = yes; then
     AC_CONFIG_FILES([nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:nextstep/templates/Info-gnustep.plist.in \
       nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop:nextstep/templates/Emacs.desktop.in])
+    ns_check_file=Resources/Info-gnustep.plist
   else
     AC_CONFIG_FILES([nextstep/Cocoa/Emacs.base/Contents/Info.plist:nextstep/templates/Info.plist.in \
       nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:nextstep/templates/InfoPlist.strings.in])
+    ns_check_file=Contents/Info.plist
   fi
+  AC_SUBST(ns_check_file)
 fi
 
 dnl Obviously there is duplication here wrt $SUBDIR_MAKEFILES.

diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 7e5e7b5..42086ec 100644 (file)
--- 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 8e768f7..3d80ddb 100644 (file)
--- 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