mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

Remove trailing / from $ns_appbindir

Browse Source 
* configure.in (ns_appbindir): Remove trailing "/".
* src/ns.mk: Update for ns_appbindir no longer having trailing "/".
This commit is contained in:
Glenn Morris 2012-05-12 11:10:37 -07:00
parent beb57c77e4
commit 9e6b06ed73
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2012-05-12 Glenn Morris <rgm@gnu.org>
* configure.in (ns_appbindir): Remove trailing "/".
* configure.in (AC_PROG_MKDIR_P): Call it, to set MKDIR_P.
(MKDEPDIR): Use $MKDIR_P.
* Makefile.in (MKDIR_P): New, set by configure.

7
configure.in
View File

@ -1568,20 +1568,17 @@ CPPFLAGS="$CPPFLAGS -x objective-c"
CFLAGS="$CFLAGS -x objective-c"
TEMACS_LDFLAGS2="\${LDFLAGS}"
GNU_OBJC_CFLAGS=
dnl I don't think it's especially important, but src/Makefile.in
dnl (now the only user of ns_appdir) used to go to the trouble of adding a
dnl trailing "/" to it, so now we do it here.
if test "${with_ns}" != no; then
if test "${opsys}" = darwin; then
NS_IMPL_COCOA=yes
ns_appdir=`pwd`/nextstep/Emacs.app
ns_appbindir=${ns_appdir}/Contents/MacOS/
ns_appbindir=${ns_appdir}/Contents/MacOS
ns_appresdir=${ns_appdir}/Contents/Resources
ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base
elif test -f $GNUSTEP_CONFIG_FILE; then
NS_IMPL_GNUSTEP=yes
ns_appdir=`pwd`/nextstep/Emacs.app
ns_appbindir=${ns_appdir}/
ns_appbindir=${ns_appdir}
ns_appresdir=${ns_appdir}/Resources
ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
dnl FIXME sourcing this several times in subshells seems inefficient.

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2012-05-12 Glenn Morris <rgm@gnu.org>
* ns.mk: Update for ns_appbindir no longer having trailing "/".
2012-05-12 Eli Zaretskii <eliz@gnu.org>
* lisp.mk (lisp): Add newcomment.elc.

6
src/ns.mk
View File

@ -30,10 +30,10 @@ ${ns_appdir}: ${ns_appsrc}
${MKDIR_P} ${ns_appdir}
( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; umask 022; tar xf - )
${ns_appbindir}Emacs: emacs${EXEEXT}
${ns_appbindir}/Emacs: emacs${EXEEXT}
${MKDIR_P} ${ns_appbindir}
cp -f emacs${EXEEXT} ${ns_appbindir}Emacs
cp -f emacs${EXEEXT} ${ns_appbindir}/Emacs
ns-app: ${ns_appdir} ${ns_appbindir}Emacs
ns-app: ${ns_appdir} ${ns_appbindir}/Emacs
### ns.mk ends here