Mercurial > emacs

comparison configure.in @ 108626:840953137f6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tweak ns_app*dir values set by configure. * configure.in (ns_appdir, ns_appbindir): Add trailing "/" to value. * Makefile.in (install-arch-dep): Update for above change. * src/Makefile.in (ns_appdir, ns_appbindir): Now configure adds the trailing "/".
author Glenn Morris <rgm@gnu.org>
date Sun, 16 May 2010 16:31:05 -0700
parents ecb7cdb525f0
children 4b6058a65883
comparison
equal deleted inserted replaced
108625:cb966dd854bc 108626:840953137f6b
1457 tmp_CPPFLAGS="$CPPFLAGS" 1457 tmp_CPPFLAGS="$CPPFLAGS"
1458 tmp_CFLAGS="$CFLAGS" 1458 tmp_CFLAGS="$CFLAGS"
1459 CPPFLAGS="$CPPFLAGS -x objective-c" 1459 CPPFLAGS="$CPPFLAGS -x objective-c"
1460 CFLAGS="$CFLAGS -x objective-c" 1460 CFLAGS="$CFLAGS -x objective-c"
1461 TEMACS_LDFLAGS2="\${LDFLAGS}" 1461 TEMACS_LDFLAGS2="\${LDFLAGS}"
1462 dnl I don't think it's especially important, but src/Makefile.in
1463 dnl (now the only user of ns_appdir) used to go to the trouble of adding a
1464 dnl trailing "/" to it, so now we do it here.
1462 if test "${with_ns}" != no; then 1465 if test "${with_ns}" != no; then
1463 if test "${opsys}" = darwin; then 1466 if test "${opsys}" = darwin; then
1464 NS_IMPL_COCOA=yes 1467 NS_IMPL_COCOA=yes
1465 ns_appdir=`pwd`/nextstep/Emacs.app 1468 ns_appdir=`pwd`/nextstep/Emacs.app/
1466 ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS 1469 ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS/
1467 ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources 1470 ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources
1468 ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base 1471 ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base
1469 elif test -f $GNUSTEP_CONFIG_FILE; then 1472 elif test -f $GNUSTEP_CONFIG_FILE; then
1470 NS_IMPL_GNUSTEP=yes 1473 NS_IMPL_GNUSTEP=yes
1471 ns_appdir=`pwd`/nextstep/Emacs.app 1474 ns_appdir=`pwd`/nextstep/Emacs.app/
1472 ns_appbindir=`pwd`/nextstep/Emacs.app 1475 ns_appbindir=`pwd`/nextstep/Emacs.app/
1473 ns_appresdir=`pwd`/nextstep/Emacs.app/Resources 1476 ns_appresdir=`pwd`/nextstep/Emacs.app/Resources
1474 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base 1477 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
1475 dnl FIXME sourcing this 3 times in subshells seems inefficient. 1478 dnl FIXME sourcing this 3 times in subshells seems inefficient.
1476 GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" 1479 GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)"
1477 GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" 1480 GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"