ooo-build r11282 - in trunk: . patches/src680

[strba svn gnome org]

Author: strba
Date: Wed Jan 16 13:39:09 2008
New Revision: 11282
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11282&view=rev

Log:
create glib2 package even when OOo_wJRE is built

Modified:
   trunk/ChangeLog
   trunk/patches/src680/scp2-package-glib2.diff

Modified: trunk/patches/src680/scp2-package-glib2.diff
==============================================================================
--- trunk/patches/src680/scp2-package-glib2.diff	(original)
+++ trunk/patches/src680/scp2-package-glib2.diff	Wed Jan 16 13:39:09 2008
@@ -197,13 +197,25 @@
  
 +.IF "$(SYSTEM_GLIB2)"!="YES"
 +SCP1FILES += \
-+             module_glib2.par	\
-+	     file_glib2.par
++             module_glib2.par   \
++             file_glib2.par
 +.ENDIF
 +
  # ------------------------------------------------------------------------
  # OpenOffice.org with JRE
  
+@@ -323,6 +324,12 @@
+ SCP2FILES += aqua_ooo.par
+ .ENDIF
+
++.IF "$(SYSTEM_GLIB2)"!="YES"
++SCP2FILES += \
++             module_glib2.par   \
++             file_glib2.par
++.ENDIF
++
+ # ------------------------------------------------------------------------
+ # URE
 --- /dev/null	2007-05-04 12:54:36.000000000 +0200
 +++ scp2/source/glib2/module_glib2.scp	2007-11-07 12:39:27.000000000 +0100
 @@ -0,0 +1,52 @@