[arch-commits] Commit in (jdk/trunk/jdk.profile jre/trunk/jre.profile)

[Eduardo Romero]

    Date: Friday, July 4, 2008 @ 01:01:07
  Author: eduardo
Revision: 4132

Modified:
  jdk/trunk/jdk.profile
  jre/trunk/jre.profile

-----------------------+
 jdk/trunk/jdk.profile |    2 +-
 jre/trunk/jre.profile |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Modified: jdk/trunk/jdk.profile
===================================================================
--- jdk/trunk/jdk.profile	2008-07-04 05:00:34 UTC (rev 4131)
+++ jdk/trunk/jdk.profile	2008-07-04 05:01:07 UTC (rev 4132)
@@ -1,4 +1,4 @@
 export J2SDKDIR=/opt/java
 export PATH=$PATH:$J2SDKDIR/bin
-export JDK_HOME=/opt/java
+export JAVA_HOME=/opt/java
 export CLASSPATH=$CLASSPATH:$J2SDKDIR/lib

Modified: jre/trunk/jre.profile
===================================================================
--- jre/trunk/jre.profile	2008-07-04 05:00:34 UTC (rev 4131)
+++ jre/trunk/jre.profile	2008-07-04 05:01:07 UTC (rev 4132)
@@ -1,4 +1,6 @@
 export J2REDIR=/opt/java/jre
 export PATH=$PATH:$J2REDIR/bin
 export CLASSPATH=$CLASSPATH:$J2REDIR/lib
-export JAVA_HOME=/opt/java/jre
+if [ ! -f /etc/profile.d/jdk.sh ]; then
+        export JAVA_HOME=/opt/java/jre
+fi