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

[Petr Mladek]

 patches/dev300/piece-scripting.diff |   26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

New commits:
commit 914be8c1d68a887462720774b49ce8e1236f74cd
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Mar 23 14:17:15 2010 +0100

    Fix piece-scripting.diff for the new vba-fix-scripting-parallelbuild.diff
    
    * patches/dev300/piece-scripting.diff: fix to apply; modify also
      scripting/source/dlgprov/makefile.mk

diff --git a/patches/dev300/piece-scripting.diff b/patches/dev300/piece-scripting.diff
index 85dafb2..32d4b4e 100644
--- a/patches/dev300/piece-scripting.diff
+++ b/patches/dev300/piece-scripting.diff
@@ -1,14 +1,24 @@
---- scripting/source/vbaevents/makefile.mk
-+++ scripting/source/vbaevents/makefile.mk
-@@ -23,8 +23,9 @@
-         $(MISC)$/$(TARGET).don \
-         $(SLOTARGET)
+--- scripting/source/dlgprov/makefile.mk.old	2010-03-23 14:25:13.000000000 +0100
++++ scripting/source/dlgprov/makefile.mk	2010-03-23 15:10:03.000000000 +0100
+@@ -77,6 +77,7 @@ ALLTAR : \
+ 
+ $(SLOFILES) : $(MISC)$/$(TARGET).don
  
 -$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
--        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
 +OOVBADIR=$(SOLARPIECE)$/$(INPATH)$/bin
 +$(MISC)$/$(TARGET).don : $(OOVBADIR)$/oovbaapi.rdb
-+        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
          echo $@
- # ------------------------------------------------------------------
+--- scripting/source/vbaevents/makefile.mk.old	2010-03-23 13:43:40.000000000 +0100
++++ scripting/source/vbaevents/makefile.mk	2010-03-23 14:06:33.000000000 +0100
+@@ -57,6 +57,7 @@ ALLTAR : \
+ 
+ $(SLOFILES) : $(MISC)$/$(TARGET).don
  
+-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
+-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++OOVBADIR=$(SOLARPIECE)$/$(INPATH)$/bin
++$(MISC)$/$(TARGET).don : $(OOVBADIR)$/oovbaapi.rdb
++        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+         echo $@