diff options
| author | obo <obo@openoffice.org> | 2010-09-15 10:27:11 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-09-15 10:27:11 +0200 |
| commit | 777b837b0e147d3606a529f4e92c10c3eb93c2ae (patch) | |
| tree | 0c8389604e71f24b2b7259d7f487e11b996561ce | |
| parent | cb486aa7b9a6d7f2b581ad9f942c19264dbe9d8a (diff) | |
masterfix OOO330: #i10000# build problem (extensions help)ooo/OOO330_m8
| -rw-r--r-- | solenv/inc/extension_helplink.mk | 8 | ||||
| -rw-r--r-- | solenv/inc/tg_help.mk | 20 |
2 files changed, 17 insertions, 11 deletions
diff --git a/solenv/inc/extension_helplink.mk b/solenv/inc/extension_helplink.mk index 907a1e06d..e375696bd 100644 --- a/solenv/inc/extension_helplink.mk +++ b/solenv/inc/extension_helplink.mk @@ -56,10 +56,10 @@ XSL_DIR*:=$(SOLARBINDIR) XHPLINKSRC*:=$(XHPDEST) STY_SWITCH:= -sty $(XSL_DIR)/embed.xsl -.IF "$(XHPFILES)"!="" -$(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/{$(aux_alllangiso)}/$i) : $(COMMONMISC)/$(TARGET).done -LINKDEPS+=$(COMMONMISC)/xhp_changed.flag -.ENDIF # "$(XHPFILES)"!="" +.IF "$(XHPFILES)"!="" && "$(HELP_OUT)"!="" +$(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/{$(aux_alllangiso)}/$i) : $(HELP_OUT)/$(TARGET).done +LINKDEPS+=$(HELP_OUT)/xhp_changed.flag +.ENDIF # "$(XHPFILES)"!="" && "$(HELP_OUT)"!="" $(HELPLINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKDEPS)) @echo Building help index for $(@:b:s/_/./:e:s/.//) diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk index b665f2f4a..cce5b9ee6 100644 --- a/solenv/inc/tg_help.mk +++ b/solenv/inc/tg_help.mk @@ -31,11 +31,17 @@ aux_alllangiso*:=$(alllangiso) SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE)) + +.IF "$(XHPDEST)"=="" XHPDEST*:=$(COMMONMISC) +HELP_OUT:=$(COMMONMISC) +.ELSE # "$(XHPDEST)"=="" +HELP_OUT:=$(MISC) +.ENDIF # "$(XHPDEST)"=="" HLANGXHPFILES*:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(XHPDEST)$/$j$/$(SHELL_PACKAGE)$/$(i:f))) -ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix +ALLTAR : $(HELP_OUT)$/$(TARGET).done $(HELP_OUT)$/xhp_changed.flag optix $(HLANGXHPFILES) : $$(@:d)thisdir.created @@ -45,7 +51,7 @@ $(XHPDEST)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp # @$(NULL) -$(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES) +$(HELP_OUT)$/$(TARGET).done : $(HLANGXHPFILES) .IF "$(WITH_LANG)"!="" $(AUGMENT_LIBRARY_PATH) $(HELPEX) -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(XHPDEST) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@ .ELSE # "$(WITH_LANG)"!="" @@ -57,24 +63,24 @@ $(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES) @$(ECHONL) .ENDIF # "$(OS)"=="SOLARIS" -$(COMMONMISC)$/xhp_changed.flag : $(HLANGXHPFILES) +$(HELP_OUT)$/xhp_changed.flag : $(HLANGXHPFILES) @$(TOUCH) $@ # urks - dmake mixes up operators and strings :-( .IF "$(HLANGXHPFILES:s/defined/xxx/)"!="" .IF "$(HELPTRANSPHONY)"!="" -$(COMMONMISC)$/$(TARGET).done .PHONY : +$(HELP_OUT)$/$(TARGET).done .PHONY : .ELSE # "$(HELPTRANSPHONY)"!="" -$(COMMONMISC)$/$(TARGET).done : makefile.mk +$(HELP_OUT)$/$(TARGET).done : makefile.mk .IF "$(WITH_LANG)"!="" -$(COMMONMISC)$/$(TARGET).done : $(LOCALIZESDF) +$(HELP_OUT)$/$(TARGET).done : $(LOCALIZESDF) .ENDIF # "$(WITH_LANG)"!="" .ENDIF # "$(HELPTRANSPHONY)"!="" .ENDIF # "$(HLANGXHPFILES)"!="" -optix: $(COMMONMISC)$/$(TARGET).done +optix: $(HELP_OUT)$/$(TARGET).done @echo done %.created : |