Commit 96182ae6 authored by Glenn Morris's avatar Glenn Morris

Minor optimization for install-arch-dep with self-contained ns build

* Makefile.in (install-arch-dep): For a self-contained ns build,
don't bother installing binaries then immediately deleting them.
parent 3a4155de
2012-05-17 Glenn Morris <rgm@gnu.org> 2012-05-17 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-arch-dep): For a self-contained ns build,
don't bother installing binaries then immediately deleting them.
* Makefile.in (ns_appbindir, ns_appresdir): * Makefile.in (ns_appbindir, ns_appresdir):
Move them before things that may refer to them. Move them before things that may refer to them.
(install-arch-dep): No need to relocate self-contained ns libexec. (install-arch-dep): No need to relocate self-contained ns libexec.
......
...@@ -465,11 +465,12 @@ install-arch-dep: mkdir ...@@ -465,11 +465,12 @@ install-arch-dep: mkdir
exec_prefix=${exec_prefix} bindir=${bindir} \ exec_prefix=${exec_prefix} bindir=${bindir} \
libexecdir=${libexecdir} archlibdir=${archlibdir} \ libexecdir=${libexecdir} archlibdir=${archlibdir} \
INSTALL_STRIP=${INSTALL_STRIP}) INSTALL_STRIP=${INSTALL_STRIP})
${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) if test "${ns_appresdir}" = ""; then \
-chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \
rm -f $(DESTDIR)${bindir}/$(EMACS) chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ; \
-ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
if test "${ns_appresdir}" != ""; then \ ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) || true ; \
else \
( cd ${ns_appresdir} ; \ ( cd ${ns_appresdir} ; \
if test -d share/emacs ; then \ if test -d share/emacs ; then \
for dir in share/emacs/${version}/*; do \ for dir in share/emacs/${version}/*; do \
...@@ -478,12 +479,7 @@ install-arch-dep: mkdir ...@@ -478,12 +479,7 @@ install-arch-dep: mkdir
fi ; \ fi ; \
if test -d share/info ; then rm -fr info; mv share/info . ; fi ; \ if test -d share/info ; then rm -fr info; mv share/info . ; fi ; \
rm -fr share ) ; \ rm -fr share ) ; \
rm -f ${ns_appbindir}/bin/emacs ${ns_appbindir}/bin/$(EMACSFULL); \ fi
else true ; fi
## FIXME NS self-contained: rather than installing emacs and
## EMACSFULL, then deleting them, obviously it would be better to not
## install them in the first place.
## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
## Needs to be the user running install, so configure can't set it. ## Needs to be the user running install, so configure can't set it.
......
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