diff options
| author |   Dylan Carlson <absinthe@gentoo.org> | 2003-05-14 16:44:46 +0000 |
|---|---|---|
| committer | Dylan Carlson <absinthe@gentoo.org> | 2003-05-14 16:44:46 +0000 |
| commit | eab8abbcdcd0797b17f1d150f98dba0d74f59bea (patch) | |
| tree | 294e9e7c31a11279b0ba0502a678b5e0dcf0a314 | |
| parent | Added "gnuconfig" to inherit and "gnuconfig_update" to src_compile() to make ... (diff) | |
| download | historical-eab8abbcdcd0797b17f1d150f98dba0d74f59bea.tar.gz historical-eab8abbcdcd0797b17f1d150f98dba0d74f59bea.tar.bz2 historical-eab8abbcdcd0797b17f1d150f98dba0d74f59bea.zip | |
dojar is now SLOT-aware.
| -rw-r--r-- | eclass/java-pkg.eclass | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/eclass/java-pkg.eclass b/eclass/java-pkg.eclass index b80807b384be..8e07937ac536 100644 --- a/eclass/java-pkg.eclass +++ b/eclass/java-pkg.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg.eclass,v 1.2 2003/05/14 04:35:54 absinthe Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg.eclass,v 1.3 2003/05/14 16:44:46 absinthe Exp $ inherit base ECLASS=java-pkg @@ -17,11 +17,18 @@ java-pkg_dojar() JARDESTTREE="lib" fi + # Set install paths sharepath="${DESTTREE}/share" - shareroot="${sharepath}/${PN}" - jardest="${shareroot}/${JARDESTTREE}" - package_env="${D}${shareroot}/package.env" - #dodir "${jardest}" + if [ "$SLOT" == "0" ] ; then + + shareroot="${sharepath}/${PN}" + jardest="${shareroot}/${JARDESTTREE}" + package_env="${D}${shareroot}/package.env" + else + shareroot="${sharepath}/${PN}-${PV}" + jardest="${shareroot}/${JARDESTTREE}" + package_env="${D}${shareroot}/package.env" + fi debug-print "JARDESTTREE=${JARDESTTREE}" debug-print "sharepath=${sharepath}" |