summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2006-06-25 16:28:09 +0000
committerJoshua Nichols <nichoj@gentoo.org>2006-06-25 16:28:09 +0000
commit921398978cf71221eb111ccd48dd29bc379dc9b0 (patch)
treea04896223794705e4c79b35a29cf4f3af8c60046 /eclass/java-vm-2.eclass
parentFixed blackdown-jdk atom (diff)
downloadhistorical-921398978cf71221eb111ccd48dd29bc379dc9b0.tar.gz
historical-921398978cf71221eb111ccd48dd29bc379dc9b0.tar.bz2
historical-921398978cf71221eb111ccd48dd29bc379dc9b0.zip
Tweak to the where env files live, to avoid conflict with generation-1 env files.
Diffstat (limited to 'eclass/java-vm-2.eclass')
-rw-r--r--eclass/java-vm-2.eclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass
index 2a50d2372de3..a9688c8a9883 100644
--- a/eclass/java-vm-2.eclass
+++ b/eclass/java-vm-2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.1 2006/06/24 18:36:59 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.2 2006/06/25 16:28:09 nichoj Exp $
#
# Author: Karl Trygve Kalleberg <karltk@gentoo.org>
@@ -77,7 +77,7 @@ set_java_env() {
local platform="$(get_system_arch)"
local env_file="${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}"
local old_env_file="${D}/etc/env.d/java/20${P}"
- local source_env_file="${FILESDIR}/${VMHANDLE}"
+ local source_env_file="${FILESDIR}/${VMHANDLE}.env"
if [[ ! -f ${source_env_file} ]]; then
die "Unable to find the env file: ${source_env_file}"