upstream

[gnu-emacs] / autogen / configure

diff --git a/autogen/configure b/autogen/configure
index a4511f5bd33b0269817687bdc62ff53a5ac3a7bb..edd092f7f815d8a3726c0c1d703f4972ddc277dd 100755 (executable)
--- a/autogen/configure
+++ b/autogen/configure
@@ -1121,6 +1121,7 @@ etcdir
 x_default_search_path
 lisppath
 locallisppath
+leimdir
 lispdir
 srcdir
 canonical
@@ -1183,7 +1184,6 @@ LIB_STANDARD
 NS_OBJC_OBJ
 NS_OBJ
 ns_self_contained
-LEIM_INSTALLDIR
 INSTALL_ARCH_INDEP_EXTRA
 TEMACS_LDFLAGS2
 LD_SWITCH_X_SITE_RPATH
@@ -3860,6 +3860,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 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'
@@ -10311,7 +10312,6 @@ fi
 
 
 INSTALL_ARCH_INDEP_EXTRA=install-etc
-LEIM_INSTALLDIR="\${install_prefix}/leim"
 ns_self_contained=no
 ns_frag=/dev/null
 NS_OBJ=
@@ -10335,7 +10335,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
@@ -10351,7 +10351,6 @@ CPPFLAGS="$tmp_CPPFLAGS"
 
 
 
-
 case "${window_system}" in
   x11 )
     HAVE_X_WINDOWS=yes
@@ -16176,6 +16175,7 @@ version=$PACKAGE_VERSION
 
 
 
+
 
 ## FIXME? Nothing uses @LD_SWITCH_X_SITE@.
 ## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the