Commit 3a4155de authored by Glenn Morris's avatar Glenn Morris

Install a self-contained NS build's libexec directly into the right place

This is rather than installing it in one place then moving it.

* configure.in (archlibdir): Set it for self-contained ns builds.
(libexecdir): Don't expand it now (this is mainly cosmetic).

* Makefile.in (ns_appbindir, ns_appresdir):
Move them before things that may refer to them.
(install-arch-dep): No need to relocate self-contained ns libexec.

* lib-src/Makefile.in (ns_appbindir): New, set by configure.
parent a0a79cde
2012-05-17 Glenn Morris <rgm@gnu.org>
* Makefile.in (ns_appbindir, ns_appresdir):
Move them before things that may refer to them.
(install-arch-dep): No need to relocate self-contained ns libexec.
* configure.in (archlibdir): Set it for self-contained ns builds.
(libexecdir): Don't expand it now (this is mainly cosmetic).
2012-05-16 Paul Eggert <eggert@cs.ucla.edu>
* configure.in: Simplify by removing CPP etc.
......
......@@ -90,6 +90,11 @@ configuration=@configuration@
# ==================== Where To Install Things ====================
# Location to install Emacs.app under GNUstep / Mac OS X.
# Later values may use these.
ns_appbindir=@ns_appbindir@
ns_appresdir=@ns_appresdir@
# The default location for installation. Everything is placed in
# subdirectories of this directory. The default values for many of
# the variables below are expressed in terms of this one, so you may
......@@ -117,8 +122,10 @@ datadir=@datadir@
sharedstatedir=@sharedstatedir@
# Where to install and expect executable files to be run by Emacs
# rather than directly by users, and other architecture-dependent
# data. ${archlibdir} is a subdirectory of this.
# rather than directly by users (and other architecture-dependent
# data, although Emacs does not have any). The executables
# are actually installed in ${archlibdir}, which is (normally)
# a subdirectory of this.
libexecdir=@libexecdir@
# Where to install Emacs's man pages.
......@@ -158,10 +165,6 @@ VPATH=@srcdir@
# Where to find the application default.
x_default_search_path=@x_default_search_path@
# Location to install Emacs.app under NeXT/Open/GNUstep / Cocoa
ns_appbindir=@ns_appbindir@
ns_appresdir=@ns_appresdir@
# Where the etc/emacs.desktop file is to be installed.
desktopdir=$(datarootdir)/applications
......@@ -475,10 +478,7 @@ install-arch-dep: mkdir
fi ; \
if test -d share/info ; then rm -fr info; mv share/info . ; fi ; \
rm -fr share ) ; \
( if cd ${ns_appbindir}/libexec ; then \
mv -f emacs/${version}/${configuration}/* . ; rm -fr emacs ; \
rm -f ../bin/emacs ../bin/$(EMACSFULL) ; \
fi ) ; \
rm -f ${ns_appbindir}/bin/emacs ${ns_appbindir}/bin/$(EMACSFULL); \
else true ; fi
## FIXME NS self-contained: rather than installing emacs and
......
......@@ -1588,7 +1588,9 @@ if test "${HAVE_NS}" = yes; then
if test "${EN_NS_SELF_CONTAINED}" = yes; then
prefix=${ns_appresdir}
exec_prefix=${ns_appbindir}
libexecdir=${ns_appbindir}/libexec
dnl This one isn't really used, only archlibdir is.
libexecdir="\${ns_appbindir}/libexec"
archlibdir="\${ns_appbindir}/libexec"
LEIM_INSTALLDIR="\${ns_appresdir}/leim"
fi
ns_frag=$srcdir/src/ns.mk
......
2012-05-17 Glenn Morris <rgm@gnu.org>
* Makefile.in (ns_appbindir): New, set by configure.
2012-05-12 Glenn Morris <rgm@gnu.org>
* Makefile.in (MKDIR_P): New, set by configure.
......
......@@ -45,6 +45,10 @@ TRANSFORM = @program_transform_name@
# ==================== Where To Install Things ====================
# Location to install Emacs.app under GNUstep / Mac OS X.
# Later values may use this.
ns_appbindir=@ns_appbindir@
# The default location for installation. Everything is placed in
# subdirectories of this directory. The default values for many of
# the variables below are expressed in terms of this one, so you may
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment