mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-21 10:24:55 +00:00
Code Issues Releases Activity

Small fix for --disable-ns-self-contained builds

Browse Source 
Do not install arch-dependent files in the app bundle if
--disable-ns-self-contained is requested.

* configure.in (exec_prefix, libexecdir): Define relative to
ns_appbindir' only if configured for a self-contained app.
* Makefile.in (install-arch-dep): Test for the existence of
libexec in the Emacs.app bundle before executing commands.

Fixes: debbugs:1335
This commit is contained in:
Yavor Doganov 2011-11-21 20:37:45 -05:00 committed by Glenn Morris
parent 84b54fdfa6
commit 816be9f629
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2011-11-22 Yavor Doganov <yavor@gnu.org>
Do not install arch-dependent files in the app bundle if
--disable-ns-self-contained is requested. (Bug#1335)
* configure.in (exec_prefix, libexecdir): Define relative to
`ns_appbindir' only if configured for a self-contained app.
* Makefile.in (install-arch-dep): Test for the existence of
libexec in the Emacs.app bundle before executing commands.
2011-11-20 Andreas Schwab <schwab@linux-m68k.org>
* configure.in: Remove reference to src/m/ibms390.h.

8
Makefile.in
View File

@ -474,10 +474,10 @@ install-arch-dep: mkdir
if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \
rm -fr share ) ; \
( cd ${ns_appbindir}libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \
rm -fr emacs ) ; \
( cd ${ns_appbindir}bin ; rm -f emacs emacs-24* ; \
ln -sf ../libexec/* .) ; \
( cd ${ns_appbindir} ; \
if test -d libexec; then cd libexec ; dir=emacs/*/*/* ; \
$(MV_DIRS); rm -fr emacs; \
cd ../bin; rm -f emacs emacs-24*; ln -sf ../libexec/* . ; fi ) ; \
else true ; fi
## FIXME is the emacs-24* bit above really necessary and correct?

4
configure.in
View File

@ -1568,10 +1568,10 @@ if test "${HAVE_NS}" = yes; then
window_system=nextstep
with_xft=no
# set up packaging dirs
exec_prefix=${ns_appbindir}
libexecdir=${ns_appbindir}/libexec
if test "${EN_NS_SELF_CONTAINED}" = yes; then
prefix=${ns_appresdir}
exec_prefix=${ns_appbindir}
libexecdir=${ns_appbindir}/libexec
fi
ns_frag=$srcdir/src/ns.mk
NS_OBJ="fontset.o fringe.o image.o"