summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-05-16 22:55:29 -0700
committerGlenn Morris <rgm@gnu.org>2012-05-16 22:55:29 -0700
commitb42c720d56003e200d059f90f0b5bc1dc79c2318 (patch)
tree0655c514403a35111e83c66275ecba1380ca1d26
parentb4a3620021f85b50a24a739a55f85fc8cc876be7 (diff)
downloademacs-b42c720d56003e200d059f90f0b5bc1dc79c2318.tar.gz
emacs-b42c720d56003e200d059f90f0b5bc1dc79c2318.tar.bz2
emacs-b42c720d56003e200d059f90f0b5bc1dc79c2318.zip
Set more installation directories for self-contained ns builds
* configure.in (docdir, etcdir, lispdir): For a self-contained ns build, set these to the appropriate values.
-rw-r--r--ChangeLog3
-rw-r--r--configure.in3
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f12e3ea69d..e95a064218e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-05-17 Glenn Morris <rgm@gnu.org>
+ * configure.in (docdir, etcdir, lispdir):
+ For a self-contained ns build, set these to the appropriate values.
+
* 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,
diff --git a/configure.in b/configure.in
index 048a8d7dec4..7cc41aa5897 100644
--- a/configure.in
+++ b/configure.in
@@ -1593,6 +1593,9 @@ if test "${HAVE_NS}" = yes; then
dnl This one isn't really used, only archlibdir is.
libexecdir="\${ns_appbindir}/libexec"
archlibdir="\${ns_appbindir}/libexec"
+ docdir="\${ns_appresdir}/etc"
+ etcdir="\${ns_appresdir}/etc"
+ lispdir="\${ns_appresdir}/lisp"
LEIM_INSTALLDIR="\${ns_appresdir}/leim"
fi
ns_frag=$srcdir/src/ns.mk