[Emacs-diffs] trunk r114100: Fix copying of nextstep/Emacs.app for make -j install

[Jan D.]

------------------------------------------------------------
revno: 114100
revision-id: address@hidden
parent: address@hidden
committer: Jan Djärv <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-02 09:01:53 +0200
message:
  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.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  nextstep/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-8711
  nextstep/Makefile.in           makefile.in-20120916183945-sy6skp4ojfe19n99-1

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-08-31 20:00:22 +0000
+++ b/ChangeLog 2013-09-02 07:01:53 +0000
@@ -1,3 +1,7 @@
+2013-09-02  Jan Djärv  <address@hidden>
+
+       * configure.ac: Add ns_check_file.
+
 2013-08-31  Glenn Morris  <address@hidden>
 
        * configure.ac (--with-sound): Rename ossaudio to bsd-ossaudio,

=== modified file 'configure.ac'
--- a/configure.ac      2013-08-31 20:00:22 +0000
+++ b/configure.ac      2013-09-02 07:01:53 +0000
@@ -4897,10 +4897,13 @@
   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.

=== modified file 'nextstep/ChangeLog'
--- a/nextstep/ChangeLog        2013-08-28 06:01:52 +0000
+++ b/nextstep/ChangeLog        2013-09-02 07:01:53 +0000
@@ -1,3 +1,8 @@
+2013-09-02  Jan Djärv  <address@hidden>
+
+       * Makefile.in (${ns_check_file}): Add so Emacs.app gets properly
+       updated when doing parallel make install.
+
 2013-08-28  Paul Eggert  <address@hidden>
 
        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,

=== modified file 'nextstep/Makefile.in'
--- a/nextstep/Makefile.in      2013-08-28 06:01:52 +0000
+++ b/nextstep/Makefile.in      2013-09-02 07:01:53 +0000
@@ -31,8 +31,9 @@
 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 @@
            ( 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