Tag: cws_src680_dba24lms User: oj Date: 2007-11-21 12:14:19+0000 Modified: dba/reportdesign/util/makefile.mk
Log: build problem when WITH_LANG is not set File Changes: Directory: /dba/reportdesign/util/ ================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.mk?r1=1.8.22.1&r2=1.8.22.2 Delta lines: +12 -4 -------------------- --- makefile.mk 2007-11-09 09:45:18+0000 1.8.22.1 +++ makefile.mk 2007-11-21 12:14:16+0000 1.8.22.2 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8.22.1 $ +# $Revision: 1.8.22.2 $ # -# last change: $Author: oj $ $Date: 2007/11/09 09:45:18 $ +# last change: $Author: oj $ $Date: 2007/11/21 12:14:16 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -215,6 +215,12 @@ XCU_FILES := $(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess.xcu \ $(ZIP1DIR)$/merge$/org$/openoffice$/Office$/DataAccess.xcu +.IF "$(WITH_LANG)"!="" +XCU_TMP := $(MISC)$/merge$/org$/openoffice$/Office$/DataAccess.xcu +.ELSE //"$(WITH_LANG)" != "" +XCU_TMP := $(MISC)$/registry$/data$/org$/openoffice$/Office$/DataAccess.xcu +.ENDIF //"$(WITH_LANG)" != "" + HTMLFILES := $(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html \ $(ZIP1DIR)$/readme_en-US.html \ $(ZIP1DIR)$/readme_en-US.txt @@ -227,6 +233,7 @@ LICLINES:=$(foreach,i,$(TXTFILES) <license-text xlink:href="registration/$(i:f)" lang="$(subst,.txt, $(subst,license_, $(i:f)))" license-id="$(subst,.txt, $(subst,license_, $(i:f)))" />) .ENDIF # "$(GUI)"!="WNT" + REPRORTJARFILES := \ $(ZIP1DIR)$/jcommon-1.0.10.jar \ $(ZIP1DIR)$/sac.jar \ @@ -274,8 +281,9 @@ @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(ZIP1DIR)$/merge$/org$/openoffice$/Office$/%.xcu : $(MISC)$/merge$/org$/openoffice$/Office$/%.xcu +$(ZIP1DIR)$/merge$/org$/openoffice$/Office$/%.xcu : $(XCU_TMP) @@-$(MKDIRHIER) $(@:d) + echo $(XCU_TMP) $(COPY) $< $@ $(ZIP1DIR)$/%.jar : $(SOLARBINDIR)$/%.jar --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
