diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-07-20 13:11:02 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-07-20 13:11:02 +0200 |
| commit | 067095785bbc0922e12bb4677d20b1927e411607 (patch) | |
| tree | 97e2f82903fc0bc66a70cd7f5b15ef1ce83fa757 /solenv/inc | |
| parent | 3e46665171ba27887ae60b0648a691ae6213d5a9 (diff) | |
txtl10n: #i113008# #i113125# rename .xht to .tree
Diffstat (limited to 'solenv/inc')
| -rwxr-xr-x | solenv/inc/tg_xmerge.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk index 26c81ff9dc9b..943b8074fc38 100755 --- a/solenv/inc/tg_xmerge.mk +++ b/solenv/inc/tg_xmerge.mk @@ -68,20 +68,20 @@ $(MISC)/$(TARGET).xtx.pmerge.mk : $(PMERGELIST) $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@ .ENDIF # "$(XTXFILES)"!="" -.IF "$(XHTFILES)"!="" -ALLTAR : $(MISC)/$(TARGET).xht.pmerge.mk $(XHTFILES) +.IF "$(TREEFILE)"!="" +ALLTAR : $(MISC)/$(TARGET).tree.pmerge.mk $(TREEFILE) -$(MISC)/$(TARGET).xht.pmerge.mk : $(XHTFILES) +$(MISC)/$(TARGET).tree.pmerge.mk : $(TREEFILE) -$(XHTFILES) : $(LOCALIZESDF) +$(TREEFILE) : $(LOCALIZESDF) -.INCLUDE .IGNORE : $(MISC)/$(TARGET).xht.pmerge.mk +.INCLUDE .IGNORE : $(MISC)/$(TARGET).tree.pmerge.mk .IF "$(alllangiso)"!="$(last_merge)" -XHTMERGEPHONY:=.PHONY +TREEMERGEPHONY:=.PHONY .ENDIF # "$(alllangiso)" != "$(last_merge)" -$(COMMONMISC)/$(PACKAGE)/en-US/%.tree $(XHTMERGEPHONY) : %.xht +$(COMMONMISC)/$(PACKAGE)/en-US/%.tree $(TREEMERGEPHONY) : %.tree @@-$(MKDIRHIER) $(@:d) .IF "$(WITH_LANG)"=="" $(COMMAND_ECHO)$(COPY) $< $@ @@ -91,7 +91,7 @@ $(COMMONMISC)/$(PACKAGE)/en-US/%.tree $(XHTMERGEPHONY) : %.xht $(COMMAND_ECHO)@noop $(assign PDESTDIR1:=$(@:d:d:d)) .ENDIF # "$(WITH_LANG)"=="" -$(MISC)/$(TARGET).xht.pmerge.mk : $(PMERGELIST1) +$(MISC)/$(TARGET).tree.pmerge.mk : $(PMERGELIST1) .IF "$(WITH_LANG)"!="" # xtxex command file requirements: # - one file per line @@ -104,6 +104,6 @@ $(MISC)/$(TARGET).xht.pmerge.mk : $(PMERGELIST1) .ENDIF # "$(WITH_LANG)"!="" @-$(RM) $@ $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@ -.ENDIF # "$(XHTFILES)"!="" +.ENDIF # "$(TREEFILE)"!="" |