aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-05-16 22:55:29 -0700
committerGlenn Morris2012-05-16 22:55:29 -0700
commitb42c720d56003e200d059f90f0b5bc1dc79c2318 (patch)
tree0655c514403a35111e83c66275ecba1380ca1d26
parentb4a3620021f85b50a24a739a55f85fc8cc876be7 (diff)
downloademacs-b42c720d56003e200d059f90f0b5bc1dc79c2318.tar.gz
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 @@
12012-05-17 Glenn Morris <rgm@gnu.org> 12012-05-17 Glenn Morris <rgm@gnu.org>
2 2
3 * configure.in (docdir, etcdir, lispdir):
4 For a self-contained ns build, set these to the appropriate values.
5
3 * configure.in (ns_self_contained): New output variable. 6 * configure.in (ns_self_contained): New output variable.
4 * Makefile.in (ns_self_contained): New, set by configure. 7 * Makefile.in (ns_self_contained): New, set by configure.
5 (install-arch-dep): For a self-contained ns build, 8 (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
1593 dnl This one isn't really used, only archlibdir is. 1593 dnl This one isn't really used, only archlibdir is.
1594 libexecdir="\${ns_appbindir}/libexec" 1594 libexecdir="\${ns_appbindir}/libexec"
1595 archlibdir="\${ns_appbindir}/libexec" 1595 archlibdir="\${ns_appbindir}/libexec"
1596 docdir="\${ns_appresdir}/etc"
1597 etcdir="\${ns_appresdir}/etc"
1598 lispdir="\${ns_appresdir}/lisp"
1596 LEIM_INSTALLDIR="\${ns_appresdir}/leim" 1599 LEIM_INSTALLDIR="\${ns_appresdir}/leim"
1597 fi 1600 fi
1598 ns_frag=$srcdir/src/ns.mk 1601 ns_frag=$srcdir/src/ns.mk