+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.
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?
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"