diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-08-26 15:45:29 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-08-26 15:45:29 +0200 |
| commit | 5d599a71562e4fc384089022e637efda6ee732b5 (patch) | |
| tree | f6166df8149da846f6494f1756b81ee8263e2c25 /solenv | |
| parent | 7d9a97af7bfcd711e6f4e95c5c28bf7c657fe148 (diff) | |
| parent | ddb099ae44524b5f03a25af3b4d7a9c9dfbc8f8d (diff) | |
CWS-TOOLING: integrate CWS coc03
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/tg_help.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk index 89f1ebabe..bfd5a0dad 100644 --- a/solenv/inc/tg_help.mk +++ b/solenv/inc/tg_help.mk @@ -31,13 +31,15 @@ aux_alllangiso*:=$(alllangiso) SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE)) -HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f))) +XHPDEST*:=$(COMMONMISC) + +HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(XHPDEST)$/$j$/$(SHELL_PACKAGE)$/$(i:f))) ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix $(HLANGXHPFILES) : $$(@:d)thisdir.created -$(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp +$(XHPDEST)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp @$(TOUCH) $@ # internal dependencies not sufficient to trigger merge? # @$(NULL) @@ -45,9 +47,9 @@ $(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp $(COMMONMISC)$/$(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 $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@ + $(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)"!="" - cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@ + cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(XHPDEST)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@ .ENDIF # "$(WITH_LANG)"!="" .IF "$(OS)"=="SOLARIS" @$(ECHONL) " " |