[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108256: Minor optimization for install-arch-dep with self-contained ns build

[Glenn Morris]

------------------------------------------------------------
revno: 108256
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-16 22:14:50 -0700
message:
  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.
modified:
  ChangeLog
  Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-17 01:23:03 +0000
+++ b/ChangeLog 2012-05-17 05:14:50 +0000
@@ -1,5 +1,8 @@
 2012-05-17  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-05-17 01:23:03 +0000
+++ b/Makefile.in       2012-05-17 05:14:50 +0000
@@ -465,11 +465,12 @@
            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 @@
            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.