[6322] | 1 | diff -up emacs-23.0.60/Makefile.in.orig emacs-23.0.60/Makefile.in |
---|
| 2 | --- emacs-23.0.60/Makefile.in.orig 2008-08-02 23:11:24.000000000 +0900 |
---|
| 3 | +++ emacs-23.0.60/Makefile.in 2008-09-08 17:01:38.000000000 +0900 |
---|
| 4 | @@ -483,14 +483,14 @@ install-arch-indep: mkdir info install-e |
---|
| 5 | done |
---|
| 6 | -rm -f $(DESTDIR)${lispdir}/subdirs.el |
---|
| 7 | $(srcdir)/update-subdirs $(DESTDIR)${lispdir} |
---|
| 8 | - if [ -f $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el ]; \ |
---|
| 9 | + if [ -f $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el ]; \ |
---|
| 10 | then true; \ |
---|
| 11 | else \ |
---|
| 12 | (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ |
---|
| 13 | echo " (normal-top-level-add-subdirs-to-load-path))") \ |
---|
| 14 | - > $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el; \ |
---|
| 15 | + > $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el; \ |
---|
| 16 | fi |
---|
| 17 | - chmod a+r $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el |
---|
| 18 | + chmod a+r $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el |
---|
| 19 | -if [ -f $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el ]; \ |
---|
| 20 | then true; \ |
---|
| 21 | else \ |
---|
| 22 | @@ -619,7 +619,7 @@ mkdir: FRC |
---|
| 23 | $(srcdir)/mkinstalldirs ${COPYDESTS} $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \ |
---|
| 24 | $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \ |
---|
| 25 | $(DESTDIR)${datadir}/emacs/site-lisp \ |
---|
| 26 | - $(DESTDIR)${datadir}/emacs/${version}/site-lisp \ |
---|
| 27 | + $(DESTDIR)${datadir}/emacs-${version}/site-lisp \ |
---|
| 28 | $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` \ |
---|
| 29 | $(DESTDIR)${desktopdir} $${icondirs} |
---|
| 30 | |
---|
| 31 | diff -up emacs-23.0.60/configure.in.orig emacs-23.0.60/configure.in |
---|
| 32 | --- emacs-23.0.60/configure.in.orig 2008-08-29 05:31:27.000000000 +0900 |
---|
| 33 | +++ emacs-23.0.60/configure.in 2008-09-08 06:36:48.000000000 +0900 |
---|
| 34 | @@ -31,7 +31,7 @@ dnl --program-transform-name options |
---|
| 35 | AC_ARG_PROGRAM |
---|
| 36 | |
---|
| 37 | lispdir='${datadir}/emacs/${version}/lisp' |
---|
| 38 | -locallisppath='${datadir}/emacs/${version}/site-lisp:'\ |
---|
| 39 | +locallisppath='${datadir}/emacs-${version}/site-lisp:'\ |
---|
| 40 | '${datadir}/emacs/site-lisp' |
---|
| 41 | lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim' |
---|
| 42 | etcdir='${datadir}/emacs/${version}/etc' |
---|