diff -up emacs-23.0.60/Makefile.in.orig emacs-23.0.60/Makefile.in
--- emacs-23.0.60/Makefile.in.orig	2008-08-02 23:11:24.000000000 +0900
+++ emacs-23.0.60/Makefile.in	2008-09-08 17:01:38.000000000 +0900
@@ -483,14 +483,14 @@ install-arch-indep: mkdir info install-e
 	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 \
@@ -619,7 +619,7 @@ mkdir: FRC
 	$(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'` \
 	  $(DESTDIR)${desktopdir} $${icondirs}
 
diff -up emacs-23.0.60/configure.in.orig emacs-23.0.60/configure.in
--- emacs-23.0.60/configure.in.orig	2008-08-29 05:31:27.000000000 +0900
+++ emacs-23.0.60/configure.in	2008-09-08 06:36:48.000000000 +0900
@@ -31,7 +31,7 @@ dnl --program-transform-name options
 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'
