Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
9a436f0c
Commit
9a436f0c
authored
May 16, 2010
by
Glenn Morris
Browse files
* configure.in (ns_appbindir, ns_appresdir): Set using $ns_appdir.
* configure: Regenerate.
parent
da53fab9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
10 deletions
+12
-10
ChangeLog
ChangeLog
+2
-0
configure
configure
+6
-6
configure.in
configure.in
+4
-4
No files found.
ChangeLog
View file @
9a436f0c
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.
* Makefile.in (install-arch-dep): Update for above change.
...
...
configure
View file @
9a436f0c
...
...
@@ -9942,15 +9942,15 @@ TEMACS_LDFLAGS2="\${LDFLAGS}"
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)"
...
...
configure.in
View file @
9a436f0c
...
...
@@ -1466,14 +1466,14 @@ 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_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)"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment