diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2016-09-09 10:50:12 +0900 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2016-09-09 10:51:33 +0900 |
| commit | da448646308533f9e2b98c3bc38072d5246d6f28 (patch) | |
| tree | cfad6448e84d456b08b5542bd18572715b92fa93 | |
| parent | net-misc/openssh: Refactor new HPN patch to be it's own patch (diff) | |
| download | gentoo-da448646308533f9e2b98c3bc38072d5246d6f28.tar.gz gentoo-da448646308533f9e2b98c3bc38072d5246d6f28.tar.bz2 gentoo-da448646308533f9e2b98c3bc38072d5246d6f28.zip | |
java-ant-2.eclass: Prefix support.
Bug: 591160
| -rw-r--r-- | eclass/java-ant-2.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 1f5734fda617..4cbce40b1aac 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -245,12 +245,12 @@ java-ant_bsfix_files() { done # for javadoc target and all in one pass, we need the new rewriter. - local rewriter3="/usr/share/javatoolkit/xml-rewrite-3.py" + local rewriter3="${EPREFIX}/usr/share/javatoolkit/xml-rewrite-3.py" if [[ ! -f ${rewriter3} ]]; then - rewriter3="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py" + rewriter3="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py" fi - local rewriter4="/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite" + local rewriter4="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite" if [[ -x ${rewriter4} && ${JAVA_ANT_ENCODING} ]]; then [[ ${JAVA_ANT_REWRITE_CLASSPATH} ]] && local gcp="-g" @@ -458,8 +458,8 @@ java-ant_ignore-system-classes() { # @DESCRIPTION: # Run the right xml-rewrite binary with the given arguments java-ant_xml-rewrite() { - local gen2="/usr/bin/xml-rewrite-2.py" - local gen2_1="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py" + local gen2="${EPREFIX}/usr/bin/xml-rewrite-2.py" + local gen2_1="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py" # gen1 is deprecated if [[ -x "${gen2}" ]]; then ${gen2} "${@}" || die "${gen2} failed" |