diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2010-01-30 22:56:57 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2010-01-30 22:56:57 +0000 |
| commit | a31420dc4e190b09cb99b50833f8f151950562a9 (patch) | |
| tree | c2609e58d1112e88a8928373a47218d0ba4d6bf2 /eclass | |
| parent | Sync from portage tree. (diff) | |
| download | emacs-a31420dc4e190b09cb99b50833f8f151950562a9.tar.gz emacs-a31420dc4e190b09cb99b50833f8f151950562a9.tar.bz2 emacs-a31420dc4e190b09cb99b50833f8f151950562a9.zip | |
Look for patch in WORKDIR too.
svn path=/emacs-overlay/; revision=1500
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/elisp.eclass | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index c68ad3f..c199ed4 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,3 +1,7 @@ +2010-01-30 Ulrich Mueller <ulm@gentoo.org> + + * elisp.eclass (elisp_src_prepare): Look for patch in WORKDIR too. + 2009-11-25 Ulrich Mueller <ulm@gentoo.org> * elisp-common.eclass: Prepare for Prefix support. @@ -651,5 +655,5 @@ * elisp.eclass: Initial. -Copyright 2002-2009 Gentoo Foundation +Copyright 2002-2010 Gentoo Foundation Distributed under the terms of the GNU General Public License v2 diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index c551304..3843644 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -1,11 +1,11 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ # # Copyright 2002-2003 Matthew Kennedy <mkennedy@gentoo.org> # Copyright 2003 Jeremy Maitin-Shepard <jbms@attbi.com> # Copyright 2007-2009 Christian Faulhammer <fauli@gentoo.org> -# Copyright 2007-2009 Ulrich Müller <ulm@gentoo.org> +# Copyright 2007-2010 Ulrich Müller <ulm@gentoo.org> # # @ECLASS: elisp.eclass # @MAINTAINER: @@ -98,6 +98,8 @@ elisp_src_prepare() { for patch in ${ELISP_PATCHES}; do if [ -f "${patch}" ]; then epatch "${patch}" + elif [ -f "${WORKDIR}/${patch}" ]; then + epatch "${WORKDIR}/${patch}" elif [ -f "${FILESDIR}/${patch}" ]; then epatch "${FILESDIR}/${patch}" else |