Mercurial > emacs

comparison configure.in @ 108627:4b6058a65883

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* configure.in (ns_appbindir, ns_appresdir): Set using $ns_appdir. * configure: Regenerate.
author Glenn Morris <rgm@gnu.org>
date Sun, 16 May 2010 16:38:13 -0700
parents 840953137f6b
children a53949523193
comparison
equal deleted inserted replaced
108626:840953137f6b 108627:4b6058a65883
1464 dnl trailing "/" to it, so now we do it here. 1464 dnl trailing "/" to it, so now we do it here.
1465 if test "${with_ns}" != no; then 1465 if test "${with_ns}" != no; then
1466 if test "${opsys}" = darwin; then 1466 if test "${opsys}" = darwin; then
1467 NS_IMPL_COCOA=yes 1467 NS_IMPL_COCOA=yes
1468 ns_appdir=`pwd`/nextstep/Emacs.app/ 1468 ns_appdir=`pwd`/nextstep/Emacs.app/
1469 ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS/ 1469 ns_appbindir=${ns_appdir}Contents/MacOS/
1470 ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources 1470 ns_appresdir=${ns_appdir}Contents/Resources
1471 ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base 1471 ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base
1472 elif test -f $GNUSTEP_CONFIG_FILE; then 1472 elif test -f $GNUSTEP_CONFIG_FILE; then
1473 NS_IMPL_GNUSTEP=yes 1473 NS_IMPL_GNUSTEP=yes
1474 ns_appdir=`pwd`/nextstep/Emacs.app/ 1474 ns_appdir=`pwd`/nextstep/Emacs.app/
1475 ns_appbindir=`pwd`/nextstep/Emacs.app/ 1475 ns_appbindir=${ns_appdir}
1476 ns_appresdir=`pwd`/nextstep/Emacs.app/Resources 1476 ns_appresdir=${ns_appdir}Resources
1477 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base 1477 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
1478 dnl FIXME sourcing this 3 times in subshells seems inefficient. 1478 dnl FIXME sourcing this 3 times in subshells seems inefficient.
1479 GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" 1479 GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)"
1480 GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" 1480 GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
1481 GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" 1481 GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"