emacs-22.1-locallisppath.patch 1.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. --- emacs-22.1/configure.in.orig 2007-05-25 21:43:29.000000000 +0900
  2. +++ emacs-22.1/configure.in 2007-06-04 14:04:10.000000000 +0900
  3. @@ -32,7 +32,7 @@
  4. AC_ARG_PROGRAM
  5. lispdir='${datadir}/emacs/${version}/lisp'
  6. -locallisppath='${datadir}/emacs/${version}/site-lisp:'\
  7. +locallisppath='${datadir}/emacs-${version}/site-lisp:'\
  8. '${datadir}/emacs/site-lisp'
  9. lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim'
  10. etcdir='${datadir}/emacs/${version}/etc'
  11. --- emacs-22.1/Makefile.in.orig 2007-05-14 23:56:28.000000000 +0900
  12. +++ emacs-22.1/Makefile.in 2007-06-04 14:06:19.000000000 +0900
  13. @@ -455,14 +455,14 @@
  14. done
  15. -rm -f $(DESTDIR)${lispdir}/subdirs.el
  16. $(srcdir)/update-subdirs $(DESTDIR)${lispdir}
  17. - if [ -f $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el ]; \
  18. + if [ -f $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el ]; \
  19. then true; \
  20. else \
  21. (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
  22. echo " (normal-top-level-add-subdirs-to-load-path))") \
  23. - > $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el; \
  24. + > $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el; \
  25. fi
  26. - chmod a+r $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el
  27. + chmod a+r $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el
  28. -if [ -f $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el ]; \
  29. then true; \
  30. else \
  31. @@ -559,7 +559,7 @@
  32. $(srcdir)/mkinstalldirs ${COPYDESTS} $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
  33. $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
  34. $(DESTDIR)${datadir}/emacs/site-lisp \
  35. - $(DESTDIR)${datadir}/emacs/${version}/site-lisp \
  36. + $(DESTDIR)${datadir}/emacs-${version}/site-lisp \
  37. $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
  38. ### Delete all the installed files that the `install' target would