--- configure.in.orig	Fri Feb 22 15:50:26 2002
+++ configure.in	Fri Feb 22 15:55:10 2002
@@ -35,18 +35,26 @@
 dnl A case that the LEIM package does not exist.
 dnl
   locallisppath='${datadir}/emacs/${version}$(EMACS_POSTFIX)/site-lisp:'\
-'${datadir}/emacs/site-lisp'
+'${datadir}/emacs/site-lisp:'\
+'${datadir}/emacs/${version}/site-lisp:'\
+'${datadir}/emacs/${version}$(EMACS_POSTFIX)/lisp:'\
+'${datadir}/emacs/${version}/lisp'
 else
 dnl
 dnl A case that the LEIM package exists.
 dnl
   locallisppath='${datadir}/emacs/${version}$(EMACS_POSTFIX)/site-lisp:'\
-'${datadir}/emacs/site-lisp:${datadir}/emacs/${version}$(EMACS_POSTFIX)/leim'
+'${datadir}/emacs/site-lisp:'\
+'${datadir}/emacs/${version}$(EMACS_POSTFIX)/leim:'\
+'${datadir}/emacs/${version}/site-lisp:'\
+'${datadir}/emacs/${version}/leim:'\
+'${datadir}/emacs/${version}$(EMACS_POSTFIX)/lisp:'\
+'${datadir}/emacs/${version}/lisp'
 fi
 
 lisppath='${locallisppath}:${lispdir}'
-etcdir='${datadir}/emacs/${version}$(EMACS_POSTFIX)/etc'
-archlibdir='${libexecdir}/emacs/${version}$(EMACS_POSTFIX)/${configuration}'
+etcdir='${datadir}/emacs/${version}/etc'
+archlibdir='${libexecdir}/emacs/${version}/${configuration}'
 docdir='${datadir}/emacs/${version}$(EMACS_POSTFIX)/etc'
 
 AC_ARG_WITH(gcc,