diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:03:42 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:03:42 +0000 |
| commit | 8ca64353176316de1053d3606fa33b3e87d57c69 (patch) | |
| tree | 49944f72240093f805e1febb7b0a2b49aa400bb2 /smoketestoo_native | |
| parent | 09b8d7f3f82b44e43b7b56b873a52cf87646fcbf (diff) | |
INTEGRATION: CWS configure21 (1.24.4); FILE MERGED
2007/06/27 14:46:17 rene 1.24.4.1: #i78950# fix PYTHONPATH
Diffstat (limited to 'smoketestoo_native')
| -rwxr-xr-x | smoketestoo_native/smoketest.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/smoketestoo_native/smoketest.pl b/smoketestoo_native/smoketest.pl index 44c814adc4ed..d8ca747ee188 100755 --- a/smoketestoo_native/smoketest.pl +++ b/smoketestoo_native/smoketest.pl @@ -7,9 +7,9 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # $RCSfile: smoketest.pl,v $ # -# $Revision: 1.24 $ +# $Revision: 1.25 $ # -# last change: $Author: vg $ $Date: 2007-02-05 11:40:45 $ +# last change: $Author: hr $ $Date: 2007-07-31 13:03:42 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -256,7 +256,7 @@ if ( $ARGV[0] ) { ( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; -$id_str = ' $Revision: 1.24 $ '; +$id_str = ' $Revision: 1.25 $ '; $id_str =~ /Revision:\s+(\S+)\s+\$/ ? ($script_rev = $1) : ($script_rev = "-"); @@ -574,7 +574,7 @@ sub doInstall { if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) { $ENV{'LD_LIBRARY_PATH'} = "$ENV{'MOZ_LIB'}:$ENV{'LD_LIBRARY_PATH'}"; } - $ENV{'PYTHONPATH'} = "$ENV{SOLARROOT}/instsetoo_native/$ENV{INPATH}/bin:$ENV{SOLARVER}/$ENV{UPD}/$ENV{INPATH}/lib"; + $ENV{'PYTHONPATH'} = "$ENV{SOLARROOT}/instsetoo_native/$ENV{INPATH}/bin:$ENV{SOLARVERSION}/$ENV{INPATH}/lib"; $ENV{OUT} = "../$ENV{INPATH}"; $ENV{LOCAL_OUT} = "../$ENV{INPATH}"; $ENV{LOCAL_COMMON_OUT} = "../$ENV{INPATH}"; |