diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2016-05-14 11:15:28 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2016-05-14 11:54:20 +0200 |
| commit | 9f4fe74fbc922f3a1c0546116a777a227c5baa83 (patch) | |
| tree | e3bdfaacca65fc94c447a5c0508e1e09dcb0b426 /eclass/java-utils-2.eclass | |
| parent | java-utils-2.eclass: DESTTREE assignment -> into, #566480 (diff) | |
| download | gentoo-9f4fe74fbc922f3a1c0546116a777a227c5baa83.tar.gz gentoo-9f4fe74fbc922f3a1c0546116a777a227c5baa83.tar.bz2 gentoo-9f4fe74fbc922f3a1c0546116a777a227c5baa83.zip | |
java-utils-2.eclass: DESTTREE querying -> /usr, #566480
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 976243f00715..9e0d2d561a30 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -2334,14 +2334,14 @@ java-pkg_init_paths_() { JAVA_PKG_NAME="${PN}-${SLOT%/*}" fi - JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" + JAVA_PKG_SHAREPATH="/usr/share/${JAVA_PKG_NAME}" JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" - JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals" + JAVA_PKG_VIRTUALS_PATH="/usr/share/java-config-2/virtuals" JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}" [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" - [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}" + [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="/usr/$(get_libdir)/${JAVA_PKG_NAME}" [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" # TODO maybe only print once? |