From: Glenn Morris <rgm@gnu.org>
Date: Mon, 21 May 2012 10:17:34 +0000 (-0400)
Subject: Auto-commit of generated files.
X-Git-Tag: emacs-24.2.90~471^2~6^2~110^2~41
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e1939eb1e4576b653c42c92497f795bea7c12084;p=emacs.git

Auto-commit of generated files.
---

diff --git a/autogen/Makefile.in b/autogen/Makefile.in
index 956a8373684..a4d5f11ca9c 100644
--- a/autogen/Makefile.in
+++ b/autogen/Makefile.in
@@ -492,7 +492,6 @@ LD_SWITCH_SYSTEM = @LD_SWITCH_SYSTEM@
 LD_SWITCH_SYSTEM_TEMACS = @LD_SWITCH_SYSTEM_TEMACS@
 LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@
 LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@
-LEIM_INSTALLDIR = @LEIM_INSTALLDIR@
 LIBGIF = @LIBGIF@
 LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
 LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
@@ -755,6 +754,7 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+leimdir = @leimdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 liblockfile = @liblockfile@
diff --git a/autogen/configure b/autogen/configure
index c46e7717bb0..c6f7cde3711 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -1099,6 +1099,7 @@ etcdir
 x_default_search_path
 lisppath
 locallisppath
+leimdir
 lispdir
 srcdir
 canonical
@@ -1164,7 +1165,6 @@ LIB_STANDARD
 NS_OBJC_OBJ
 NS_OBJ
 ns_self_contained
-LEIM_INSTALLDIR
 INSTALL_ARCH_INDEP_EXTRA
 TEMACS_LDFLAGS2
 LD_SWITCH_X_SITE_RPATH
@@ -3731,6 +3731,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'
@@ -10109,7 +10110,6 @@ fi
 
 
 INSTALL_ARCH_INDEP_EXTRA=install-etc
-LEIM_INSTALLDIR="\${install_prefix}/leim"
 ns_self_contained=no
 ns_frag=/dev/null
 NS_OBJ=
@@ -10133,7 +10133,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
@@ -10149,7 +10149,6 @@ CPPFLAGS="$tmp_CPPFLAGS"
 
 
 
-
 case "${window_system}" in
   x11 )
     HAVE_X_WINDOWS=yes
@@ -15991,6 +15990,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