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.

diff --git a/ChangeLog b/ChangeLog
index 04ce3736d5bfaabc43cffa9c73b16ef89fcea363..e30635140ef4e8473c366246fa5c1281541fde85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 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):
        Move them before things that may refer to them.
        (install-arch-dep): No need to relocate self-contained ns libexec.

diff --git a/Makefile.in b/Makefile.in
index 389bbf95f905ff1a54c76a3c6f5c87f46cbc0987..e9ab4e6733dff60e0c144047d19c1a2c193f1584 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -465,11 +465,12 @@ install-arch-dep: mkdir
            exec_prefix=${exec_prefix} bindir=${bindir} \
            libexecdir=${libexecdir} archlibdir=${archlibdir} \
            INSTALL_STRIP=${INSTALL_STRIP})
-       ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL)
-       -chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL)
-       rm -f $(DESTDIR)${bindir}/$(EMACS)
-       -ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS)
-       if test "${ns_appresdir}" != ""; then \
+       if test "${ns_appresdir}" = ""; then \
+         ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \
+         chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ; \
+         rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
+         ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) || true ; \
+       else \
          ( cd ${ns_appresdir} ; \
            if test -d share/emacs ; then \
              for dir in share/emacs/${version}/*; do \
@@ -478,12 +479,7 @@ install-arch-dep: mkdir
            fi ; \
            if test -d share/info ; then rm -fr info; mv share/info . ; fi ; \
            rm -fr share ) ; \
-         rm -f ${ns_appbindir}/bin/emacs ${ns_appbindir}/bin/$(EMACSFULL); \
-       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.
+       fi
 
 ## 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.