diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-05-23 11:02:07 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-05-23 11:02:07 +0000 |
| commit | c39863b174067184dd79e7dcdda2752edcdacc3e (patch) | |
| tree | 9a60e4d7052497ba3560f0d1eae83e04e33b093b /eclass/java-utils-2.eclass | |
| parent | java-pkg_get-jni-cflags: pick the right directory on Darwin and Solaris too (diff) | |
| download | prefix-c39863b174067184dd79e7dcdda2752edcdacc3e.tar.gz prefix-c39863b174067184dd79e7dcdda2752edcdacc3e.tar.bz2 prefix-c39863b174067184dd79e7dcdda2752edcdacc3e.zip | |
java-pkg_verify-classes fix checks for Prefix
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 75d3c12505..b35e4d0443 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -2637,10 +2637,10 @@ java-pkg_jar-list() { java-pkg_verify-classes() { #$(find ${ED} -type f -name '*.jar' -o -name '*.class') - local version_verify="/usr/bin/class-version-verify.py" + local version_verify="${EPREFIX}/usr/bin/class-version-verify.py" if [[ ! -x "${version_verify}" ]]; then - version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py" + version_verify="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py" fi if [[ ! -x "${version_verify}" ]]; then @@ -2654,11 +2654,11 @@ java-pkg_verify-classes() { local result local log="${T}/class-version-verify.log" if [[ -n "${1}" ]]; then - ${EPREFIX}${version_verify} -v -t ${target} "${1}" > "${log}" + ${version_verify} -v -t ${target} "${1}" > "${log}" result=$? else ebegin "Verifying java class versions (target: ${target})" - ${EPREFIX}${version_verify} -v -t ${target} -r "${ED}" > "${log}" + ${version_verify} -v -t ${target} -r "${ED}" > "${log}" result=$? eend ${result} fi |