Applied Ruedigers envvars fix to all other scripts where we are

trying to decide whether the platform is 64bit or not. We should have
been checking for the existance of the /usr/lib64/jvm/jre folder instead
of just checking for the existance of the /usr/lib64 folder.
This commit is contained in:
Juan Carlos Luciani 2008-06-05 16:43:23 +00:00
parent 98792359d8
commit a50234c0f6
5 changed files with 11 additions and 4 deletions

View File

@ -41,7 +41,7 @@ if [ "$1" != "" ]; then
fi fi
fi fi
if [ -d /usr/lib64 ]; then if [ -d /usr/lib64/jvm/jre ]; then
LIB=lib64 LIB=lib64
else else
LIB=lib LIB=lib

View File

@ -8,7 +8,7 @@
############################################################ ############################################################
# Set JAVA_HOME # Set JAVA_HOME
if [ -d /usr/lib64 ]; then if [ -d /usr/lib64/jvm/jre ]; then
LIB=lib64 LIB=lib64
else else
LIB=lib LIB=lib

View File

@ -34,7 +34,7 @@
# # # #
############################################################# #############################################################
if [ -d /usr/lib64 ]; then if [ -d /usr/lib64/jvm/jre ]; then
LIB=lib64 LIB=lib64
else else
LIB=lib LIB=lib

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jun 4 14:57:02 CEST 2008 - ro@suse.de
- fix build on ppc:
do not assume machine is lib64 just because that directory
exists, rather test the directory we try to access
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 3 10:14:36 MDT 2008 - jluciani@novell.com Tue Jun 3 10:14:36 MDT 2008 - jluciani@novell.com

View File

@ -30,7 +30,7 @@
# /var/lib/CASA/authtoken/validate folder. # # /var/lib/CASA/authtoken/validate folder. #
# # # #
############################################################ ############################################################
if [ -d /usr/lib64 ]; then if [ -d /usr/lib64/jvm/jre ]; then
LIB=lib64 LIB=lib64
SUNLIBDIR=amd64 SUNLIBDIR=amd64
else else