[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100328: * configure.in (ns_appbindir
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100328: * configure.in (ns_appbindir, ns_appresdir): Set using $ns_appdir. |
Date: |
Sun, 16 May 2010 16:38:13 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100328
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2010-05-16 16:38:13 -0700
message:
* configure.in (ns_appbindir, ns_appresdir): Set using $ns_appdir.
* configure: Regenerate.
modified:
ChangeLog
configure
configure.in
=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-16 23:31:05 +0000
+++ b/ChangeLog 2010-05-16 23:38:13 +0000
@@ -1,5 +1,7 @@
2010-05-16 Glenn Morris <address@hidden>
+ * configure.in (ns_appbindir, ns_appresdir): Set using $ns_appdir.
+
* configure.in (ns_appdir, ns_appbindir): Add trailing "/" to value.
* Makefile.in (install-arch-dep): Update for above change.
=== modified file 'configure'
--- a/configure 2010-05-16 23:01:56 +0000
+++ b/configure 2010-05-16 23:38:13 +0000
@@ -9942,15 +9942,15 @@
if test "${with_ns}" != no; then
if test "${opsys}" = darwin; then
NS_IMPL_COCOA=yes
- ns_appdir=`pwd`/nextstep/Emacs.app
- ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS
- ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources
+ ns_appdir=`pwd`/nextstep/Emacs.app/
+ 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=`pwd`/nextstep/Emacs.app
- ns_appresdir=`pwd`/nextstep/Emacs.app/Resources
+ ns_appdir=`pwd`/nextstep/Emacs.app/
+ ns_appbindir=${ns_appdir}
+ ns_appresdir=${ns_appdir}Resources
ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo
$GNUSTEP_MAKEFILES)"
GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo
$GNUSTEP_SYSTEM_HEADERS)"
=== modified file 'configure.in'
--- a/configure.in 2010-05-16 23:31:05 +0000
+++ b/configure.in 2010-05-16 23:38:13 +0000
@@ -1466,14 +1466,14 @@
if test "${opsys}" = darwin; then
NS_IMPL_COCOA=yes
ns_appdir=`pwd`/nextstep/Emacs.app/
- ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS/
- ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources
+ 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=`pwd`/nextstep/Emacs.app/
- ns_appresdir=`pwd`/nextstep/Emacs.app/Resources
+ ns_appbindir=${ns_appdir}
+ ns_appresdir=${ns_appdir}Resources
ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
dnl FIXME sourcing this 3 times in subshells seems inefficient.
GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100328: * configure.in (ns_appbindir, ns_appresdir): Set using $ns_appdir.,
Glenn Morris <=