[Emacs-diffs] /srv/bzr/emacs/trunk r108257: Fix previous change, for NS builds that are not self-contained

[Glenn Morris]

------------------------------------------------------------
revno: 108257
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-16 22:32:37 -0700
message:
  Fix previous change, for NS builds that are not self-contained
  
  * configure.in (ns_self_contained): New output variable.
  * Makefile.in (ns_self_contained): New, set by configure.
  (install-arch-dep): Use $ns_self_contained.
modified:
  ChangeLog
  Makefile.in
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-17 05:14:50 +0000
+++ b/ChangeLog 2012-05-17 05:32:37 +0000
@@ -1,6 +1,8 @@
 2012-05-17  Glenn Morris  <address@hidden>
 
-       * Makefile.in (install-arch-dep): For a self-contained ns build,
+       * configure.in (ns_self_contained): New output variable.
+       * Makefile.in (ns_self_contained): New, set by configure.
+       (install-arch-dep): For a self-contained ns build,
        don't bother installing binaries then immediately deleting them.
 
        * Makefile.in (ns_appbindir, ns_appresdir):

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-05-17 05:14:50 +0000
+++ b/Makefile.in       2012-05-17 05:32:37 +0000
@@ -94,6 +94,8 @@
 # Later values may use these.
 address@hidden@
 address@hidden@
+# Either yes or no depending on whether this is a relocatable Emacs.app.
address@hidden@
 
 # The default location for installation.  Everything is placed in
 # subdirectories of this directory.  The default values for many of
@@ -465,13 +467,13 @@
            exec_prefix=${exec_prefix} bindir=${bindir} \
            libexecdir=${libexecdir} archlibdir=${archlibdir} \
            INSTALL_STRIP=${INSTALL_STRIP})
-       if test "${ns_appresdir}" = ""; then \
+       if test "${ns_self_contained}" = "no"; 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} ; \
+         ( cd ${ns_appresdir} || exit 1 ; \
            if test -d share/emacs ; then \
              for dir in share/emacs/${version}/*; do \
                rm -fr `basename "$$dir"`; mv "$$dir" . ; \

=== modified file 'configure.in'
--- a/configure.in      2012-05-17 01:23:03 +0000
+++ b/configure.in      2012-05-17 05:32:37 +0000
@@ -1574,6 +1574,7 @@
 AC_SUBST(TEMACS_LDFLAGS2)
 
 LEIM_INSTALLDIR="\${install_prefix}/leim"
+ns_self_contained=no
 ns_frag=/dev/null
 NS_OBJ=
 NS_OBJC_OBJ=
@@ -1586,6 +1587,7 @@
   with_xft=no
   # set up packaging dirs
   if test "${EN_NS_SELF_CONTAINED}" = yes; then
+     ns_self_contained=yes
      prefix=${ns_appresdir}
      exec_prefix=${ns_appbindir}
      dnl This one isn't really used, only archlibdir is.
@@ -1600,6 +1602,7 @@
 CFLAGS="$tmp_CFLAGS"
 CPPFLAGS="$tmp_CPPFLAGS"
 AC_SUBST(LEIM_INSTALLDIR)
+AC_SUBST(ns_self_contained)
 AC_SUBST(NS_OBJ)
 AC_SUBST(NS_OBJC_OBJ)
 AC_SUBST(LIB_STANDARD)