diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2008-02-13 19:44:15 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2008-02-13 19:44:15 +0000 |
| commit | b8bebd4fa5d3ea80f92b93ea05fda7d906aedf82 (patch) | |
| tree | 31c168c1e3a753d11cc52299829ec203295e768a /eclass | |
| parent | version bump (diff) | |
| download | gentoo-2-b8bebd4fa5d3ea80f92b93ea05fda7d906aedf82.tar.gz gentoo-2-b8bebd4fa5d3ea80f92b93ea05fda7d906aedf82.tar.bz2 gentoo-2-b8bebd4fa5d3ea80f92b93ea05fda7d906aedf82.zip | |
Don't use in java-ant_xml-rewrite because it's run during the src_ functions.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-ant-2.eclass | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 86aafcc5d780..e12b4fd34e80 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -14,7 +14,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.28 2008/01/27 03:37:49 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.29 2008/02/13 19:44:15 betelgeuse Exp $ inherit java-utils-2 @@ -269,7 +269,7 @@ java-ant_bsfix_files() { die "Do not define JAVA_ANT_JAVADOC_OUTPUT_DIR!" fi # Where will our generated javadoc go. - readonly JAVA_ANT_JAVADOC_OUTPUT_DIR=${WORKDIR}/gentoo_javadoc + readonly JAVA_ANT_JAVADOC_OUTPUT_DIR="${WORKDIR}/gentoo_javadoc" mkdir -p "${JAVA_ANT_JAVADOC_OUTPUT_DIR}" || die if hasq doc ${IUSE}; then @@ -387,8 +387,7 @@ java-ant_ignore-system-classes() { # Run the right xml-rewrite binary with the given arguments # ------------------------------------------------------------------------------ java-ant_xml-rewrite() { - local bindir="${ROOT}/usr/bin/" - local gen2="${bindir}/xml-rewrite-2.py" + local gen2="/usr/bin/xml-rewrite-2.py" # gen1 is deprecated if [[ -x "${gen2}" ]]; then ${gen2} "${@}" || die "${gen2} failed" |