diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-30 11:48:21 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-30 11:48:21 +0000 |
| commit | f82e8cea88aa0b563824f819e3e9146a5bd02674 (patch) | |
| tree | 0498c61ed0ad505d9ad3221f682d5ba99916e164 /solenv/inc | |
| parent | c8ff384377b9c14b1fed95732eb8aebebcafa5a9 (diff) | |
INTEGRATION: CWS ause091 (1.21.4); FILE MERGED
2008/07/25 11:26:36 hjs 1.21.4.1: #i92130# normalize output filename before passing it over to xsltproc
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/tg_config.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk index 84ddacdda43e..fe5475800dfd 100644 --- a/solenv/inc/tg_config.mk +++ b/solenv/inc/tg_config.mk @@ -8,7 +8,7 @@ # # $RCSfile: tg_config.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.22 $ # # This file is part of OpenOffice.org. # @@ -62,12 +62,12 @@ $(XCS_TRIM) : $(DTDDIR)$/registry$/component-schema.dtd \ $(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/%.xcs : %.xcs @echo -------------+ validating and stripping schema files -$(MKDIRHIER) $(@:d) - $(XSLTPROC) --nonet -o $(@:d)$*.val \ + $(XSLTPROC) --nonet -o $(normpath $(PWD)$/$(@:d)$*.val) \ --stringparam componentName $(PACKAGE).$* \ $(SYSXSLDIR)schema_val.xsl $< - $(XSLTPROC) --nonet -o $(@:d)$*.san \ + $(XSLTPROC) --nonet -o $(normpath $(PWD)$/$(@:d)$*.san) \ $(SYSXSLDIR)sanity.xsl $< - $(XSLTPROC) --nonet -o $@ \ + $(XSLTPROC) --nonet -o $(normpath $(PWD)$/$@) \ $(SYSXSLDIR)schema_trim.xsl $< +-$(RM) $(@:d)$*.val > $(NULLDEV) +-$(RM) $(@:d)$*.san > $(NULLDEV) @@ -85,7 +85,7 @@ $(XCS_RESOURCES) : $(XSLDIR)$/resource.xsl $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.properties :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcs @echo -------------+ creating locale dependent resource bundles -$(MKDIRHIER) $(@:d) - $(XSLTPROC) --nonet -o $@ \ + $(XSLTPROC) --nonet -o $(normpath $(PWD)$/$@) \ --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \ $(SYSXSLDIR)resource.xsl $< @@ -108,11 +108,11 @@ $(XCU_DEFAULT) : $(DTDDIR)$/registry$/component-update.dtd \ $(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/%.xcu : %.xcu @echo -------------+ validating and creating a locale independent file -$(MKDIRHIER) $(@:d) - $(XSLTPROC) --nonet -o $(@:d)$*.val \ + $(XSLTPROC) --nonet -o $(normpath $(PWD)$/$(@:d)$*.val) \ --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ $(SYSXSLDIR)data_val.xsl $< - $(XSLTPROC) --nonet -o $@ \ + $(XSLTPROC) --nonet -o $(normpath $(PWD)$/$@) \ --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ $(SYSXSLDIR)alllang.xsl $< @@ -138,7 +138,7 @@ $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.xcu :| %.xcu .ENDIF # "$(WITH_LANG)"!="" @echo ------------- creating locale dependent entries -$(MKDIRHIER) $(@:d) - $(XSLTPROC) --nonet -o $@ \ + $(XSLTPROC) --nonet -o $(normpath $(PWD)$/$@) \ --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \ @@ -165,7 +165,7 @@ $(XCU_MODULES) : $(XSLDIR)$/alllang.xsl $(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/%.xcu :| $$(@:b:s/-/./:b).xcu @echo -------------+ creating a module file -$(MKDIRHIER) $(@:d) - $(XSLTPROC) --nonet -o $@ \ + $(XSLTPROC) --nonet -o $(normpath $(PWD)$/$@) \ --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$(<:b).xcs \ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ --stringparam module $(subst,$(<:b)-, $(*)) \ |