To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=105690
------- Additional comments from [email protected] Fri Oct 9 06:02:41 +0000 2009 ------- Looking at the diff between m59 and m60, it is clear that the 2nd ENDIF that has been added in the change is misplaced. It is supposed to be at the end of the file to match up with the 2nd IF that has been added. IOW, the .IF "$(ENABLE_VBA)"!="YES" is supposed to bracket the complete makefile. --- constants/makefile.mk (.../DEV300_m59/oovbaapi/ooo/vba) (Revision 276794) +++ constants/makefile.mk (.../DEV300_m60/oovbaapi/ooo/vba) (Revision 276794) @@ -36,6 +36,7 @@ PACKAGE=org$/vba$/constants # --- Settings ----------------------------------------------------- + .INCLUDE : $(PRJ)$/util$/makefile.pmk .IF "$(ENABLE_VBA)"!="YES" @@ -43,8 +44,8 @@ @echo "not building vba..." .ELSE +.IF "$(L10N_framework)"=="" # ------------------------------------------------------------------------ - # I tried to use the IDLFILES target but it failed dismally MY_GEN_IDL_PATH=$(MISC)$/idl MY_GEN_UCR_PATH=$(OUT)$/ucr$/$(PACKAGE) @@ -53,10 +54,12 @@ 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 +.IF "$(L10N_framework)"=="" ALLTAR: $(MYDBTARGET) $(MY_GEN_UCR_PATH)$/%.urd: $(MY_GEN_IDL_PATH)$/%.idl @@ -66,4 +69,3 @@ $(REGMERGE) $(OUT)$/ucr/constants.db /UCR @$(mktmp $(MYURDFILES)) .ENDIF - --------------------------------------------------------------------- Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
