--- emacs-22.1/configure.in.orig	2007-05-25 21:43:29.000000000 +0900
+++ emacs-22.1/configure.in	2007-06-04 14:04:10.000000000 +0900
@@ -32,7 +32,7 @@
 AC_ARG_PROGRAM
 
 lispdir='${datadir}/emacs/${version}/lisp'
-locallisppath='${datadir}/emacs/${version}/site-lisp:'\
+locallisppath='${datadir}/emacs-${version}/site-lisp:'\
 '${datadir}/emacs/site-lisp'
 lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim'
 etcdir='${datadir}/emacs/${version}/etc'
--- emacs-22.1/Makefile.in.orig	2007-05-14 23:56:28.000000000 +0900
+++ emacs-22.1/Makefile.in	2007-06-04 14:06:19.000000000 +0900
@@ -455,14 +455,14 @@
 	done
 	-rm -f $(DESTDIR)${lispdir}/subdirs.el
 	$(srcdir)/update-subdirs $(DESTDIR)${lispdir}
-	if [ -f $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el ]; \
+	if [ -f $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el ]; \
 	then true; \
 	else \
 	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
 	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
-	    > $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el; \
+	    > $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el; \
 	fi
-	chmod a+r $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el
+	chmod a+r $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el
 	-if [ -f $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el ]; \
 	then true; \
 	else \
@@ -559,7 +559,7 @@
 	$(srcdir)/mkinstalldirs ${COPYDESTS} $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
 	  $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
 	  $(DESTDIR)${datadir}/emacs/site-lisp \
-	  $(DESTDIR)${datadir}/emacs/${version}/site-lisp \
+	  $(DESTDIR)${datadir}/emacs-${version}/site-lisp \
 	  $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
 
 ### Delete all the installed files that the `install' target would
