ooo-build r13079 - in trunk: . bin distro-configs

[vmiklos svn gnome org]

Author: vmiklos
Date: Sun Jul  6 21:48:26 2008
New Revision: 13079
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13079&view=rev

Log:
2008-07-06  Miklos Vajna  <vmiklos frugalware org>

       * bin/ooinstall, distro-configs/Frugalware.conf.in, download.in:
       Enable ODK on Frugalware.


Modified:
   trunk/ChangeLog
   trunk/bin/ooinstall
   trunk/distro-configs/Frugalware.conf.in
   trunk/download.in

Modified: trunk/bin/ooinstall
==============================================================================
--- trunk/bin/ooinstall	(original)
+++ trunk/bin/ooinstall	Sun Jul  6 21:48:26 2008
@@ -158,7 +158,7 @@
 	}
 }
 
-if (($setup_vars{'VENDORNAME'} eq 'Novell' || $setup_vars{'VENDORNAME'} eq 'Debian' || $setup_vars{'VENDORNAME'} eq 'Mandriva' ) && $configure_vars{BUILD_TYPE} =~ m/ODK/) {
+if (($setup_vars{'VENDORNAME'} eq 'Novell' || $setup_vars{'VENDORNAME'} eq 'Debian' || $setup_vars{'VENDORNAME'} eq 'Mandriva' || $setup_vars{'VENDORNAME'} eq 'Frugalware' ) && $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 " .

Modified: trunk/distro-configs/Frugalware.conf.in
==============================================================================
--- trunk/distro-configs/Frugalware.conf.in	(original)
+++ trunk/distro-configs/Frugalware.conf.in	Sun Jul  6 21:48:26 2008
@@ -25,7 +25,6 @@
 --enable-cairo
 --enable-xsltproc
 --disable-rpath
---disable-odk
 --disable-qadevooo
 --enable-gcjaot
 --with-system-libxslt

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Sun Jul  6 21:48:26 2008
@@ -354,6 +354,7 @@
 if ($download_all ||
     $distro =~ m/Debian/ ||
     $distro =~ m/Ubuntu/ ||
+    $distro =~ m/Frugalware/ ||
     $distro eq 'OxygenOfficeLinux' || $distro eq 'OxygenOfficeWindows' || 
     '@BUILD_WIN32@' ne '') {
     push @files, ( source_file( "sdk" ) );