diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2013-09-02 09:01:53 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-09-02 09:01:53 +0200 |
| commit | de3d0b572de7b7c03ba3a2c4153d89e50f411da9 (patch) | |
| tree | d00c1e501eedaba5d02211f3933279e26c6fc34c | |
| parent | 1fccc5306363a88fc3f663e2a149d0251612d3e9 (diff) | |
| download | emacs-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.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | nextstep/ChangeLog | 5 | ||||
| -rw-r--r-- | nextstep/Makefile.in | 5 |
4 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 14bac067213..ba6c22c13b6 100644 --- 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 6cafa3eda57..2d12a8f8297 100644 --- 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 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 |