[ooo-build-commit] .: bin/ooinstall

[Michael Meeks]

 bin/ooinstall |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 42a93c33f2e349c13044db8a31eceae2ee6c358d
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Oct 1 14:30:54 2010 +0100

    fix system-python install ...

diff --git a/bin/ooinstall b/bin/ooinstall
index 9dd94be..9187a7e 100755
--- a/bin/ooinstall
+++ b/bin/ooinstall
@@ -76,11 +76,8 @@ if ( $configure_vars{'SYSTEM_MOZILLA'} eq 'YES' ) {
     $configure_vars{'LD_LIBRARY_PATH'} = "$configure_vars{'MOZ_LIB'}:$configure_vars{'LD_LIBRARY_PATH'}";
 }
 
-# Workaround for the Python
-if ( $configure_vars{'SYSTEM_PYTHON'} eq 'NO' ) {
-    $configure_vars{'PYTHONPATH'} = "$setup_vars{'OOBUILDDIR'}/instsetoo_native/$configure_vars{'INPATH'}/bin:$configure_vars{'SOLARVERSION'}/$configure_vars{'INPATH'}/lib";
-}
-else {
+# Something Petr or Fridrich implemented, and needs explaining:
+if ( $configure_vars{'SYSTEM_PYTHON'} ne 'NO' ) {
    my @pythonsubstitutions = ( 'PYTHONPATH', 'PYTHONHOME' );
    for my $pythonsubst (@pythonsubstitutions) {
        for my $pythonkey (keys %configure_vars) {
@@ -88,6 +85,8 @@ else {
        }
    }    
 }
+# Workaround for the Python
+$configure_vars{'PYTHONPATH'} = "$setup_vars{'OOBUILDDIR'}/instsetoo_native/$configure_vars{'INPATH'}/bin:$configure_vars{'SOLARVERSION'}/$configure_vars{'INPATH'}/lib:". $configure_vars{'PYTHONPATH'};
 
 for $arg (@ARGV) {
     if ($arg eq '-l') {