diff options
| author |   Matthew Kennedy <mkennedy@gentoo.org> | 2006-03-06 00:15:01 +0000 |
|---|---|---|
| committer | Matthew Kennedy <mkennedy@gentoo.org> | 2006-03-06 00:15:01 +0000 |
| commit | a030cd92725fed693ad1adaf15c763c5ec5b8382 (patch) | |
| tree | 90965f75dc2c0349632bf9469c7290a23b7851a6 /app-editors/emacs-cvs/files | |
| parent | Initial port. Ebuild contributed by Ulrich Mueller <ulm@kph.uni-mainz.de>; R... (diff) | |
| download | gentoo-2-a030cd92725fed693ad1adaf15c763c5ec5b8382.tar.gz gentoo-2-a030cd92725fed693ad1adaf15c763c5ec5b8382.tar.bz2 gentoo-2-a030cd92725fed693ad1adaf15c763c5ec5b8382.zip | |
Create new emacs-subdirs-el-gentoo.diff for latest CVS; Resolves Bug #124999.
(Portage version: 2.1_pre5-r1)
Diffstat (limited to 'app-editors/emacs-cvs/files')
| -rw-r--r-- | app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff b/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff index c76aab71b771..3ca46deaa796 100644 --- a/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff +++ b/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff @@ -1,32 +1,34 @@ ---- Makefile.in 2002-10-19 10:21:01.000000000 +0900 -+++ Makefile.in.subdirs-el 2004-08-02 17:01:35.852417016 +0900 -@@ -387,18 +387,21 @@ +diff -ur emacs.orig/Makefile.in emacs/Makefile.in +--- emacs.orig/Makefile.in 2006-03-05 17:38:35.000000000 -0600 ++++ emacs/Makefile.in 2006-03-05 18:04:23.000000000 -0600 +@@ -445,18 +445,21 @@ then true; \ else \ (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ -+ echo " (normal-top-level-add-subdirs-to-load-path))"; \ -+ echo "(setq default-directory \"/usr/share/emacs/site-lisp\")"; \ -+ echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ ++ echo " (normal-top-level-add-subdirs-to-load-path))"; \ ++ echo "(setq default-directory \"/usr/share/emacs/site-lisp\")"; \ ++ echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ echo " (normal-top-level-add-subdirs-to-load-path))") \ - > ${datadir}/emacs/${version}/site-lisp/subdirs.el; \ + > $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el; \ fi - chmod a+r ${datadir}/emacs/${version}/site-lisp/subdirs.el -- -if [ -f ${datadir}/emacs/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 \ - (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ - echo " (normal-top-level-add-subdirs-to-load-path))") \ -- > ${datadir}/emacs/site-lisp/subdirs.el; \ +- > $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el; \ - fi -- -chmod a+r ${datadir}/emacs/site-lisp/subdirs.el -+# -if [ -f ${datadir}/emacs/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))") \ -+# > ${datadir}/emacs/site-lisp/subdirs.el; \ -+# fi -+# -chmod a+r ${datadir}/emacs/site-lisp/subdirs.el +- -chmod a+r $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el ++# -if [ -f $(DESTDIR)${datadir}/emacs/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/site-lisp/subdirs.el; \ ++# fi ++# -chmod a+r $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el -unset CDPATH; \ - if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \ + if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \ then \ +Only in emacs: Makefile.in.~1.311.~ |