procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix copying of nextstep/Emacs.app for make -j install

Browse source 
* configure.ac: Add ns_check_file.

* nextstep/Makefile.in (${ns_check_file}): Add so Emacs.app gets properly
updated when doing parallel make install.
This commit is contained in:
Jan Djärv 2013-09-02 09:01:53 +02:00
parent 1fccc53063
commit de3d0b572d
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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,

3
configure.ac
View file

@ -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.

5
nextstep/ChangeLog
View file

@ -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,

5
nextstep/Makefile.in
View file

@ -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