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

[Fridrich Strba]

 bin/ooinstall |    9 ---------
 1 file changed, 9 deletions(-)

New commits:
commit 95c4b21f56b8802843d0ba25ee4961acc7da2e01
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Oct 1 15:41:31 2010 +0200

    Removing a part not needed anymore with python 2.6

diff --git a/bin/ooinstall b/bin/ooinstall
index 9187a7e..da30b6e 100755
--- a/bin/ooinstall
+++ b/bin/ooinstall
@@ -76,15 +76,6 @@ if ( $configure_vars{'SYSTEM_MOZILLA'} eq 'YES' ) {
     $configure_vars{'LD_LIBRARY_PATH'} = "$configure_vars{'MOZ_LIB'}:$configure_vars{'LD_LIBRARY_PATH'}";
 }
 
-# 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) {
-	   $configure_vars{$pythonkey} =~ s/\$$pythonsubst/$configure_vars{$pythonsubst}/g;
-       }
-   }    
-}
 # 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'};