[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108286: Avoid installation followed by immediate deletion for self-contained ns

[Glenn Morris]

------------------------------------------------------------
revno: 108286
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-05-18 00:41:13 -0700
message:
  Avoid installation followed by immediate deletion for self-contained ns
  
  * configure.in (INSTALL_ARCH_INDEP_EXTRA): New output variable.
  * Makefile.in (INSTALL_ARCH_INDEP_EXTRA): New, set by configure.
  (install-arch-indep): Don't install-etc for self-contained ns builds.
modified:
  ChangeLog
  Makefile.in
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-18 07:14:45 +0000
+++ b/ChangeLog 2012-05-18 07:41:13 +0000
@@ -1,5 +1,9 @@
 2012-05-18  Glenn Morris  <address@hidden>
 
+       * configure.in (INSTALL_ARCH_INDEP_EXTRA): New output variable.
+       * Makefile.in (INSTALL_ARCH_INDEP_EXTRA): New, set by configure.
+       (install-arch-indep): Don't install-etc for self-contained ns builds.
+
        * configure.in (GCC_TEST_OPTIONS, NON_GCC_TEST_OPTIONS) <darwin>:
        No longer unconditonally add /sw directories.  (Bug#2280)
 

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-05-18 07:34:10 +0000
+++ b/Makefile.in       2012-05-18 07:41:13 +0000
@@ -523,6 +523,10 @@
 ## into RCS).  In order to make this safe, we make sure that the
 ## source exists and is distinct from the destination.
 
+## This is install-etc for everything except self-contained-ns builds.
+## For them, it is empty.
+INSTALL_ARCH_INDEP_EXTRA = @INSTALL_ARCH_INDEP_EXTRA@
+
 ## I'm not sure creating locallisppath here serves any useful purpose.
 ## If it has the default value, then the later write_subdir commands
 ## will ensure all these components exist.
@@ -530,7 +534,7 @@
 ## Is it really Emacs's job to create those directories?
 ## Should we also be ensuring they contain subdirs.el files?
 ## It would be easy to do, just use write_subdir.
-install-arch-indep: info install-etc install-leim
+install-arch-indep: info install-leim ${INSTALL_ARCH_INDEP_EXTRA}
        umask 022 ; \
          $(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
        -set ${COPYDESTS} ; \

=== modified file 'configure.in'
--- a/configure.in      2012-05-18 07:14:45 +0000
+++ b/configure.in      2012-05-18 07:41:13 +0000
@@ -1573,6 +1573,7 @@
 fi
 AC_SUBST(TEMACS_LDFLAGS2)
 
+INSTALL_ARCH_INDEP_EXTRA=install-etc
 LEIM_INSTALLDIR="\${install_prefix}/leim"
 ns_self_contained=no
 ns_frag=/dev/null
@@ -1600,6 +1601,7 @@
      infodir="\${ns_appresdir}/info"
      lispdir="\${ns_appresdir}/lisp"
      LEIM_INSTALLDIR="\${ns_appresdir}/leim"
+     INSTALL_ARCH_INDEP_EXTRA=
   fi
   ns_frag=$srcdir/src/ns.mk
   NS_OBJ="fontset.o fringe.o image.o"
@@ -1607,6 +1609,7 @@
 fi
 CFLAGS="$tmp_CFLAGS"
 CPPFLAGS="$tmp_CPPFLAGS"
+AC_SUBST(INSTALL_ARCH_INDEP_EXTRA)
 AC_SUBST(LEIM_INSTALLDIR)
 AC_SUBST(ns_self_contained)
 AC_SUBST(NS_OBJ)