diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-05-21 00:30:23 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-05-21 00:30:23 -0700 |
| commit | d71dfe75556b7bb4534bfaca0b7cf6cef563961e (patch) | |
| tree | c6b4a29a081f7d82edd56b444953eb74d336c069 /configure.in | |
| parent | a52c0aa070a8d0919cf7c175d5a5f9a212ef3526 (diff) | |
| download | emacs-d71dfe75556b7bb4534bfaca0b7cf6cef563961e.tar.gz | |
Rename LEIM_INSTALLDIR to leimdir, treat consistently with lispdir
* configure.in (LEIM_INSTALLDIR): Rename to leimdir, treat like lispdir.
* leim/Makefile.in (install_prefix): Remove.
(LEIM_INSTALLDIR): Rename to leimdir.
(install): Update for this change.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 87c9a6cd276..ab11b9d6431 100644 --- a/configure.in +++ b/configure.in @@ -37,6 +37,7 @@ dnl hence the single quotes. This is per the GNU coding standards, see dnl (autoconf) Installation Directory Variables dnl See also epaths.h below. lispdir='${datadir}/emacs/${version}/lisp' +leimdir='${datadir}/emacs/${version}/leim' locallisppath='${datadir}/emacs/${version}/site-lisp:'\ '${datadir}/emacs/site-lisp' lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim' @@ -1572,7 +1573,6 @@ fi AC_SUBST(TEMACS_LDFLAGS2) INSTALL_ARCH_INDEP_EXTRA=install-etc -LEIM_INSTALLDIR="\${install_prefix}/leim" ns_self_contained=no ns_frag=/dev/null NS_OBJ= @@ -1599,7 +1599,7 @@ if test "${HAVE_NS}" = yes; then infodir="\${ns_appresdir}/info" mandir="\${ns_appresdir}/man" lispdir="\${ns_appresdir}/lisp" - LEIM_INSTALLDIR="\${ns_appresdir}/leim" + leimdir="\${ns_appresdir}/leim" INSTALL_ARCH_INDEP_EXTRA= fi ns_frag=$srcdir/src/ns.mk @@ -1609,7 +1609,6 @@ 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) AC_SUBST(NS_OBJC_OBJ) @@ -3222,6 +3221,7 @@ AC_SUBST(libexecdir) AC_SUBST(mandir) AC_SUBST(infodir) AC_SUBST(lispdir) +AC_SUBST(leimdir) AC_SUBST(locallisppath) AC_SUBST(lisppath) AC_SUBST(x_default_search_path) |