[ooo-build-commit] Branch 'ooo-build-3-2' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                         |    2 +
 patches/dev300/sdext-presenter-makefile.diff |   31 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

New commits:
commit c87cd46ce52da0d2f9764d5132a14a51b36c8a09
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Jan 20 14:31:14 2010 +0100

    Fix presenter screen extension build
    
    * patches/dev300/sdext-presenter-makefile.diff:
    * patches/dev300/apply: fix order of the IF/THEN conditionals

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0ce23c1..984d3a6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -394,6 +394,8 @@ wiki-publisher-no-license.diff
 pdfimport-no-license.diff
 build-java-target-extensions.diff, i#93115, pmladek
 sdext-minimizer-docked.diff, thorsten
+# fix order of the IF/THEN conditionals
+sdext-presenter-makefile.diff, pmladek
 
 [ NovellOnlyExtensionFixes ]
 # allow build with ant-1.6
diff --git a/patches/dev300/sdext-presenter-makefile.diff b/patches/dev300/sdext-presenter-makefile.diff
new file mode 100644
index 0000000..a508c79
--- /dev/null
+++ b/patches/dev300/sdext-presenter-makefile.diff
@@ -0,0 +1,31 @@
+--- sdext/source/presenter/makefile.mk.old	2010-01-18 17:59:14.000000000 +0100
++++ sdext/source/presenter/makefile.mk	2010-01-20 13:21:06.000000000 +0100
+@@ -41,14 +41,15 @@ ENABLE_EXCEPTIONS=TRUE
+ 
+ .INCLUDE : rtlbootstrap.mk
+ .INCLUDE : settings.mk
+-.IF "$(L10N_framework)"==""
+-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+ 
+ .IF "$(ENABLE_PRESENTER_SCREEN)" == "NO"
+ @all:
+     @echo "Presenter Screen build disabled."
+ .ELSE
+ 
++.IF "$(L10N_framework)"==""
++.INCLUDE :  $(PRJ)$/util$/makefile.pmk
++
+ DLLPRE=
+ common_build_zip=
+ 
+@@ -349,9 +350,9 @@ $(DESCRIPTION) $(PHONYDESC) : $$(@:f)
+     @@-$(RM) $(DESCRIPTION_TMP)
+ 
+ 
+-.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
+ .ELSE
+ ivo:
+     $(ECHO)
+ .ENDIF # L10N_framework
++.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
+