From: Petteri Räty <betelgeuse@gentoo.org>
Date: Wed, 13 Feb 2008 19:44:15 +0000 (+0000)
Subject: Don't use  in java-ant_xml-rewrite because it's run during the src_ functions.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=577e2e3cc307ef1a58f1837d65a875dc2ab1b4ca;p=gentoo.git

Don't use  in java-ant_xml-rewrite because it's run during the src_ functions.
---

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"