From: Glenn Morris Date: Fri, 18 May 2012 07:41:13 +0000 (-0700) Subject: Avoid installation followed by immediate deletion for self-contained ns X-Git-Tag: emacs-24.2.90~471^2~29 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0629a797a195aad88656003387cc4bbfb6aa74e2;p=emacs.git 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. --- diff --git a/ChangeLog b/ChangeLog index e8bd7061222..6129800f25b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-18 Glenn Morris + * 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) : No longer unconditonally add /sw directories. (Bug#2280) diff --git a/Makefile.in b/Makefile.in index 3b66db4e8c5..432f26919ec 100644 --- a/Makefile.in +++ b/Makefile.in @@ -523,6 +523,10 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \ ## 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 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \ ## 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} ; \ diff --git a/configure.in b/configure.in index 6b16b4356b0..74f55334636 100644 --- a/configure.in +++ b/configure.in @@ -1573,6 +1573,7 @@ fail; 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 @@ if test "${HAVE_NS}" = yes; then 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 @@ if test "${HAVE_NS}" = yes; then 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)