diff options
| author | Jan Djärv | 2013-09-02 09:01:53 +0200 |
|---|---|---|
| committer | Jan Djärv | 2013-09-02 09:01:53 +0200 |
| commit | de3d0b572de7b7c03ba3a2c4153d89e50f411da9 (patch) | |
| tree | d00c1e501eedaba5d02211f3933279e26c6fc34c /nextstep | |
| parent | 1fccc5306363a88fc3f663e2a149d0251612d3e9 (diff) | |
| download | emacs-de3d0b572de7b7c03ba3a2c4153d89e50f411da9.tar.gz emacs-de3d0b572de7b7c03ba3a2c4153d89e50f411da9.zip | |
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/ChangeLog | 5 | ||||
| -rw-r--r-- | nextstep/Makefile.in | 5 |
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 @@ | |||
| 1 | 2013-09-02 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * Makefile.in (${ns_check_file}): Add so Emacs.app gets properly | ||
| 4 | updated when doing parallel make install. | ||
| 5 | |||
| 1 | 2013-08-28 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2013-08-28 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | * Makefile.in (SHELL): Now @SHELL@, not /bin/sh, | 8 | * 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@ | |||
| 31 | ns_appdir = @ns_appdir@ | 31 | ns_appdir = @ns_appdir@ |
| 32 | ns_appbindir = @ns_appbindir@ | 32 | ns_appbindir = @ns_appbindir@ |
| 33 | ns_appsrc = @ns_appsrc@ | 33 | ns_appsrc = @ns_appsrc@ |
| 34 | ns_check_file = @ns_appdir@/@ns_check_file@ | ||
| 34 | 35 | ||
| 35 | ${ns_appdir}: ${srcdir}/${ns_appsrc} ${ns_appsrc} | 36 | ${ns_check_file} ${ns_appdir}: ${srcdir}/${ns_appsrc} ${ns_appsrc} |
| 36 | rm -rf ${ns_appdir} | 37 | rm -rf ${ns_appdir} |
| 37 | ${MKDIR_P} ${ns_appdir} | 38 | ${MKDIR_P} ${ns_appdir} |
| 38 | ( cd ${srcdir}/${ns_appsrc} ; tar cfh - . ) | \ | 39 | ( cd ${srcdir}/${ns_appsrc} ; tar cfh - . ) | \ |
| @@ -42,7 +43,7 @@ ${ns_appdir}: ${srcdir}/${ns_appsrc} ${ns_appsrc} | |||
| 42 | ( cd ${ns_appdir} ; umask 022; tar xf - ) | 43 | ( cd ${ns_appdir} ; umask 022; tar xf - ) |
| 43 | touch ${ns_appdir} | 44 | touch ${ns_appdir} |
| 44 | 45 | ||
| 45 | ${ns_appbindir}/Emacs: ${ns_appdir} ../src/emacs${EXEEXT} | 46 | ${ns_appbindir}/Emacs: ${ns_appdir} ${ns_check_file} ../src/emacs${EXEEXT} |
| 46 | ${MKDIR_P} ${ns_appbindir} | 47 | ${MKDIR_P} ${ns_appbindir} |
| 47 | cp -f ../src/emacs${EXEEXT} ${ns_appbindir}/Emacs | 48 | cp -f ../src/emacs${EXEEXT} ${ns_appbindir}/Emacs |
| 48 | 49 | ||