[Libreoffice-commits] .: bin/ooinstall

[Cédric Bosdonnat]

 bin/ooinstall |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 890fa930e220ba506f3072a76c8072aabdf330cc
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Wed Oct 13 22:00:52 2010 +0200

    Removed the vendor check before installing SDK in ooinstall

diff --git a/bin/ooinstall b/bin/ooinstall
index 144dc8b..1e1a1ed 100755
--- a/bin/ooinstall
+++ b/bin/ooinstall
@@ -147,7 +147,7 @@ system ("cd $setup_vars{OOBUILDDIR}/instsetoo_native/util ; " .
 	"-buildid $BUILD $destdir $strip " .
 	"-simple $path") && die "Failed to install: $!";
 
-if (($setup_vars{'VENDORNAME'} eq 'Novell' || $setup_vars{'VENDORNAME'} eq 'Debian' || $setup_vars{'VENDORNAME'} eq 'Mandriva' || $setup_vars{'VENDORNAME'} eq 'Frugalware' || $setup_vars{'VENDORNAME'} eq 'Gentoo') && $configure_vars{BUILD_TYPE} =~ m/ODK/) {
+if ($configure_vars{BUILD_TYPE} =~ m/ODK/) {
     print "Running SDK installer\n";
     system ("cd $setup_vars{OOBUILDDIR}/instsetoo_native/util ; " .
 	"perl -w $configure_vars{SOLARENV}/bin/make_installer.pl " .