aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2006-09-19 03:12:48 +0000
committerJoshua Nichols <nichoj@gentoo.org>2006-09-19 03:12:48 +0000
commitbd4e3fadb1c200c0cb897275253b27a625478cd6 (patch)
tree35cdc0834a9d185c3d9fa519852557d0fc887231
parentMinor fixes. (diff)
downloadjava-config-bd4e3fadb1c200c0cb897275253b27a625478cd6.tar.gz
java-config-bd4e3fadb1c200c0cb897275253b27a625478cd6.tar.bz2
java-config-bd4e3fadb1c200c0cb897275253b27a625478cd6.zip
Use a slightly smarter way of checking multilibness
svn path=/projects/java-config-2/trunk/; revision=2881
-rw-r--r--src/eselect/java-nsplugin.eselect14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/eselect/java-nsplugin.eselect b/src/eselect/java-nsplugin.eselect
index 0bb91fa..3d21db0 100644
--- a/src/eselect/java-nsplugin.eselect
+++ b/src/eselect/java-nsplugin.eselect
@@ -2,6 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Id: $
+inherit tests multilib
+
DESCRIPTION="Manage the Java plugin for Netscape-like Browsers"
MAINTAINER="java@gentoo.org"
SVN_DATE='$Date: $'
@@ -16,14 +18,12 @@ SYSTEM_PLUGIN="${SYSTEM_PLUGIN_DIR}/javaplugin.so"
SYSTEM_PLUGIN_32="${SYSTEM_PLUGIN_DIR_32}/javaplugin.so"
SYSTEM_PLUGIN_64="${SYSTEM_PLUGIN_DIR_64}/javaplugin.so"
-if [[ -z ${IS_MULTILIB} ]]; then
- if [[ -d ${ROOT}/lib32 && -d ${ROOT}/lib64 ]]; then
- IS_MULTILIB="true"
- else
- IS_MULTILIB="false"
- fi
+libdirs=$(list_libdirs)
+if has lib32 ${libdirs} && has lib64 ${libdirs}; then
+ IS_MULTILIB="true"
+else
+ IS_MULTILIB="false"
fi
-
### show action
## {{{ show stuff