summaryrefslogtreecommitdiff
path: root/oovbaapi
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2009-10-09 12:28:54 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2009-10-09 12:28:54 +0000
commite04d800a514e33cc58b67d4d257c625b3263008b (patch)
treeb4174be74372a3a794dcd4c2ba17e7b8090b7a50 /oovbaapi
parentf6b5993f23a8bb69e30a16da9e14b7b2bb6a094a (diff)
#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#.
Diffstat (limited to 'oovbaapi')
-rw-r--r--oovbaapi/ooo/vba/constants/makefile.mk2
-rw-r--r--oovbaapi/ooo/vba/makefile.mk3
2 files changed, 3 insertions, 2 deletions
diff --git a/oovbaapi/ooo/vba/constants/makefile.mk b/oovbaapi/ooo/vba/constants/makefile.mk
index 0b092e6f7999..fa9cdaddc1c4 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 6f9815bfeb72..99a11e5ac0fa 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