Commit 9a436f0c authored by Glenn Morris's avatar Glenn Morris

* configure.in (ns_appbindir, ns_appresdir): Set using $ns_appdir.

* configure: Regenerate.
parent da53fab9
2010-05-16 Glenn Morris <rgm@gnu.org> 2010-05-16 Glenn Morris <rgm@gnu.org>
* configure.in (ns_appbindir, ns_appresdir): Set using $ns_appdir.
* configure.in (ns_appdir, ns_appbindir): Add trailing "/" to value. * configure.in (ns_appdir, ns_appbindir): Add trailing "/" to value.
* Makefile.in (install-arch-dep): Update for above change. * Makefile.in (install-arch-dep): Update for above change.
......
...@@ -9942,15 +9942,15 @@ TEMACS_LDFLAGS2="\${LDFLAGS}" ...@@ -9942,15 +9942,15 @@ TEMACS_LDFLAGS2="\${LDFLAGS}"
if test "${with_ns}" != no; then if test "${with_ns}" != no; then
if test "${opsys}" = darwin; then if test "${opsys}" = darwin; then
NS_IMPL_COCOA=yes NS_IMPL_COCOA=yes
ns_appdir=`pwd`/nextstep/Emacs.app ns_appdir=`pwd`/nextstep/Emacs.app/
ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS ns_appbindir=${ns_appdir}Contents/MacOS/
ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources ns_appresdir=${ns_appdir}Contents/Resources
ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base
elif test -f $GNUSTEP_CONFIG_FILE; then elif test -f $GNUSTEP_CONFIG_FILE; then
NS_IMPL_GNUSTEP=yes NS_IMPL_GNUSTEP=yes
ns_appdir=`pwd`/nextstep/Emacs.app ns_appdir=`pwd`/nextstep/Emacs.app/
ns_appbindir=`pwd`/nextstep/Emacs.app ns_appbindir=${ns_appdir}
ns_appresdir=`pwd`/nextstep/Emacs.app/Resources ns_appresdir=${ns_appdir}Resources
ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)"
GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
......
...@@ -1466,14 +1466,14 @@ if test "${with_ns}" != no; then ...@@ -1466,14 +1466,14 @@ if test "${with_ns}" != no; then
if test "${opsys}" = darwin; then if test "${opsys}" = darwin; then
NS_IMPL_COCOA=yes NS_IMPL_COCOA=yes
ns_appdir=`pwd`/nextstep/Emacs.app/ ns_appdir=`pwd`/nextstep/Emacs.app/
ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS/ ns_appbindir=${ns_appdir}Contents/MacOS/
ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources ns_appresdir=${ns_appdir}Contents/Resources
ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base
elif test -f $GNUSTEP_CONFIG_FILE; then elif test -f $GNUSTEP_CONFIG_FILE; then
NS_IMPL_GNUSTEP=yes NS_IMPL_GNUSTEP=yes
ns_appdir=`pwd`/nextstep/Emacs.app/ ns_appdir=`pwd`/nextstep/Emacs.app/
ns_appbindir=`pwd`/nextstep/Emacs.app/ ns_appbindir=${ns_appdir}
ns_appresdir=`pwd`/nextstep/Emacs.app/Resources ns_appresdir=${ns_appdir}Resources
ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
dnl FIXME sourcing this 3 times in subshells seems inefficient. dnl FIXME sourcing this 3 times in subshells seems inefficient.
GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment