diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2013-01-17 16:30:15 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2013-01-17 16:30:15 +0000 |
| commit | 28b6da56af79d204cc11ec5304ed3b0076f4e3dc (patch) | |
| tree | 1abd058b983ab91acbf13a6553a71af4b572d3b3 | |
| parent | Change version scheme to x.y.z so it can't be mistaken with version numbers f... (diff) | |
| download | eselect-java-28b6da56af79d204cc11ec5304ed3b0076f4e3dc.tar.gz eselect-java-28b6da56af79d204cc11ec5304ed3b0076f4e3dc.tar.bz2 eselect-java-28b6da56af79d204cc11ec5304ed3b0076f4e3dc.zip | |
Support ROOT and Gentoo Prefix
svn path=/projects/eselect-java/trunk/; revision=9148
| -rw-r--r-- | src/modules/java-nsplugin.eselect.in | 13 | ||||
| -rw-r--r-- | src/modules/java-vm.eselect.in | 10 |
2 files changed, 10 insertions, 13 deletions
diff --git a/src/modules/java-nsplugin.eselect.in b/src/modules/java-nsplugin.eselect.in index 030fb5c..c87cff9 100644 --- a/src/modules/java-nsplugin.eselect.in +++ b/src/modules/java-nsplugin.eselect.in @@ -1,5 +1,5 @@ # -*-eselect-*- vim: ft=eselect -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 inherit tests multilib @@ -8,13 +8,10 @@ DESCRIPTION="Manage the Java plugin for Netscape-like Browsers" MAINTAINER="java@gentoo.org" VERSION="@VERSION@" -PLUGINS_HOME="${ROOT}/usr/share/java-config-2/nsplugin" -SYSTEM_PLUGIN_DIR="${ROOT}/usr/lib/nsbrowser/plugins" -SYSTEM_PLUGIN_DIR_32="${ROOT}/usr/lib32/nsbrowser/plugins" -SYSTEM_PLUGIN_DIR_64="${ROOT}/usr/lib64/nsbrowser/plugins" -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" +PLUGINS_HOME="${EROOT}/usr/share/java-config-2/nsplugin" +SYSTEM_PLUGIN="${EROOT}/usr/lib/nsbrowser/plugins/javaplugin.so" +SYSTEM_PLUGIN_32="${EROOT}/usr/lib32/nsbrowser/plugins/javaplugin.so" +SYSTEM_PLUGIN_64="${EROOT}/usr/lib64/nsbrowser/plugins/javaplugin.so" is_multilib() { local libdirs=$(list_libdirs) diff --git a/src/modules/java-vm.eselect.in b/src/modules/java-vm.eselect.in index 0b36f8c..68a5493 100644 --- a/src/modules/java-vm.eselect.in +++ b/src/modules/java-vm.eselect.in @@ -1,15 +1,15 @@ # -*-eselect-*- vim: ft=eselect -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 DESCRIPTION="Manage the Java system and user VM" MAINTAINER="java@gentoo.org" VERSION="@VERSION@" -VM_BASE=/usr/lib/jvm -VM_SYSTEM="/etc/java-config-2/current-system-vm" -VM_USER="${HOME}/.gentoo/java-config-2/current-user-vm" -VM_CONFIG="/usr/share/java-config-2/vm" +VM_BASE="${EROOT}/usr/lib/jvm/" +VM_SYSTEM="${EROOT}/etc/java-config-2/current-system-vm" +VM_USER="${HOME}/.gentoo${EPREFIX}/java-config-2/current-user-vm" +VM_CONFIG="${EROOT}/usr/share/java-config-2/vm" find_targets() { local f |