[ooo-build-commit] Branch 'ooo/master' - oovbaapi/ooo

[Jan Holesovsky]

 oovbaapi/ooo/vba/constants/makefile.mk |    2 +-
 oovbaapi/ooo/vba/makefile.mk           |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 7bb2ff66f3cfbfdb4a05e501cf3326bbcdd4f142
Author: Rüdiger Timm <rt at openoffice.org>
Date:   Fri Oct 9 12:28:54 2009 +0000

    #i105690# Patch by mux2005: fix compile error in module oovbaapi when building with --disable-vba. And, sorry, my previous (r276809) commit had the wrong issue ID: that openssl stuff is #i105699#.

diff --git a/oovbaapi/ooo/vba/constants/makefile.mk b/oovbaapi/ooo/vba/constants/makefile.mk
index 0b092e6..fa9cdad 100644
--- a/oovbaapi/ooo/vba/constants/makefile.mk
+++ b/oovbaapi/ooo/vba/constants/makefile.mk
@@ -55,7 +55,6 @@ MYIDLFILES=$(foreach,i,$(MYTMPIDLFILES) $(MY_GEN_IDL_PATH)$/$(i))
 MYURDFILES=$(foreach,i,$(MYIDLFILES) $(MY_GEN_UCR_PATH)$/$(i:b).urd)
 MYDBTARGET=$(OUT)$/ucr/constants.db
 .ENDIF
-.ENDIF
 
 .INCLUDE :  target.mk
 
@@ -69,3 +68,4 @@ $(MYDBTARGET) : $(MYURDFILES)  $(MYIDLFILES)
     $(REGMERGE) $(OUT)$/ucr/constants.db /UCR @$(mktmp $(MYURDFILES))
 
 .ENDIF
+.ENDIF
diff --git a/oovbaapi/ooo/vba/makefile.mk b/oovbaapi/ooo/vba/makefile.mk
index 6f9815b..99a11e5 100644
--- a/oovbaapi/ooo/vba/makefile.mk
+++ b/oovbaapi/ooo/vba/makefile.mk
@@ -41,7 +41,7 @@ PACKAGE=ooo$/vba
 .IF "$(ENABLE_VBA)"!="YES"
 dummy:
         @echo "not building vba..."
-.ENDIF
+.ELSE
 
 # ------------------------------------------------------------------------
 .IF "$(L10N_framework)"=""
@@ -62,3 +62,4 @@ IDLFILES=\
 # ------------------------------------------------------------------
 .ENDIF
 .INCLUDE :  target.mk
+.ENDIF