diff options
author | Glenn Morris <rgm@gnu.org> | 2012-05-18 00:41:13 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2012-05-18 00:41:13 -0700 |
commit | 0629a797a195aad88656003387cc4bbfb6aa74e2 (patch) | |
tree | 58e0efb4aec691bcebe27eba0b2e2b09a4c805c7 /configure.in | |
parent | 80a511622c52f16583c549a3b16cd419a77f015e (diff) | |
download | emacs-0629a797a195aad88656003387cc4bbfb6aa74e2.tar.gz |
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.
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 3 |
1 files changed, 3 insertions, 0 deletions
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) |