diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2019-10-30 21:25:00 +0100 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2019-10-30 21:27:17 +0100 |
| commit | 8cb182d6a7c9a6f75df73e64f15d34e077271405 (patch) | |
| tree | 9ab56aec3c02a59bd872738b8a5ecb3feecf0e61 /eclass/java-utils-2.eclass | |
| parent | net-mail/courier-imap: adding info as courier-imap run now as user mail (diff) | |
| download | gentoo-8cb182d6a7c9a6f75df73e64f15d34e077271405.tar.gz gentoo-8cb182d6a7c9a6f75df73e64f15d34e077271405.tar.bz2 gentoo-8cb182d6a7c9a6f75df73e64f15d34e077271405.zip | |
eclass/java-{ant,utils}: updated for new javatoolkit layout
Bug: https://bugs.gentoo.org/627440
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 4f7eb0356fc9..e32cb572f147 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -2729,10 +2729,13 @@ java-pkg_jar-list() { java-pkg_verify-classes() { #$(find ${D} -type f -name '*.jar' -o -name '*.class') - local version_verify="/usr/bin/class-version-verify.py" + local version_verify_1="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py" + local version_verify_2="${EPREFIX}/usr/libexec/javatoolkit/class-version-verify.py" - if [[ ! -x "${version_verify}" ]]; then - version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py" + if [[ -x "${version_verify_1}" ]]; then + local version_verify=${version_verify_1} + else + local version_verify=${version_verify_2} fi if [[ ! -x "${version_verify}" ]]; then |