--- configure.in.orig	Tue Jun 26 11:38:25 2001
+++ configure.in	Tue Jun 26 11:39:29 2001
@@ -35,7 +35,11 @@
 dnl A case that the LEIM package exists.
 dnl
   locallisppath='${datadir}/emacs/${version}-emcws/site-lisp:'\
-'${datadir}/emacs/site-lisp:${datadir}/emacs/${version}-emcws/leim'
+'${datadir}/emacs/site-lisp:'\
+'${datadir}/emacs/${version}-emcws/leim:'\
+'${datadir}/emacs/${version}/site-lisp:'\
+'${datadir}/emacs/${version}/leim:'\
+'${datadir}/emacs/${version}/lisp'\
   echo
   echo modifying leim/Makefile.in for emcws
   mv leim/Makefile.in leim/Makefile.in.orig
@@ -49,12 +53,14 @@
 dnl A case that the LEIM package does not exist.
 dnl
   locallisppath='${datadir}/emacs/${version}-emcws/site-lisp:'\
-'${datadir}/emacs/site-lisp'
+'${datadir}/emacs/site-lisp:'\
+'${datadir}/emacs/${version}/site-lisp:'\
+'${datadir}/emacs/${version}/lisp'
 fi
 
 lisppath='${locallisppath}:${lispdir}'
-etcdir='${datadir}/emacs/${version}-emcws/etc'
-archlibdir='${libexecdir}/emacs/${version}-emcws/${configuration}'
+etcdir='${datadir}/emacs/${version}/etc'
+archlibdir='${libexecdir}/emacs/${version}/${configuration}'
 docdir='${datadir}/emacs/${version}-emcws/etc'
 
 AC_ARG_WITH(gcc,