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

[Cédric Bosdonnat]

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

New commits:
commit baab40f5646b63ff51e7cb9c5aaac873066d46fe
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Fri Oct 1 10:25:23 2010 +0200

    Removed the extension install as it's already done somewhere else

diff --git a/bin/ooinstall b/bin/ooinstall
index feaa0e4..9dd94be 100755
--- a/bin/ooinstall
+++ b/bin/ooinstall
@@ -167,13 +167,6 @@ if (($setup_vars{'VENDORNAME'} eq 'Novell' || $setup_vars{'VENDORNAME'} eq 'Debi
 }
 print "Installer finished\n";
 
-# FIXME: needs a way to package extensions - this here is dev
-# build-only
-if ( !defined $setup_vars{OODESTDIR} || $setup_vars{OODESTDIR} eq "") {
-	print "Installing extensions...\n";
-	&find(\&wanted, "$setup_vars{OOBUILDDIR}/solver/");
-}
-
 if ($do_link) {
     `$configure_vars{SOLARENV}/bin/linkoo $path $configure_vars{SRC_ROOT}`;
 }
commit d67ec448e620d66dcabf182c1b039d577a54069b
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Fri Oct 1 10:07:52 2010 +0200

    Fixed the ooinstall script when using system python

diff --git a/bin/ooinstall b/bin/ooinstall
index d2d6a96..feaa0e4 100755
--- a/bin/ooinstall
+++ b/bin/ooinstall
@@ -77,7 +77,7 @@ if ( $configure_vars{'SYSTEM_MOZILLA'} eq 'YES' ) {
 }
 
 # Workaround for the Python
-if ( $configure_vars{'SYSTEM_PYTHON'} eq 'YES' ) {
+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 {