diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-05-31 22:58:51 +0100 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-05-31 22:58:51 +0100 |
| commit | b3bb67ed8798f9e1023631cefcfeb233ef1502e3 (patch) | |
| tree | b3d534d1b2b3530c3d5f8a32c2fff5e86f7f49b2 | |
| parent | 49bf775f03b6bc6553471b29bbe97e6697dc6f17 (diff) | |
| parent | c1bfeebf1406d9012a3be9ad4c783b58aab56372 (diff) | |
cmcfixes74: merge with DEV300 m80
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 863c316..002cea5 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -29,9 +29,9 @@ PRJ = .. PRJNAME = postprocess TARGET = packregistry -MY_XCS = $(SOLARXMLDIR)/registry/schema/org/openoffice -MY_XCU = $(SOLARXMLDIR)/registry/data/org/openoffice -MY_MOD = $(SOLARXMLDIR)/registry/spool +MY_XCS = registry/schema/org/openoffice +MY_XCU = registry/data/org/openoffice +MY_MOD = registry/spool MY_XCDS = \ $(MISC)/base.xcd \ @@ -484,25 +484,26 @@ ALLTAR : \ $(MISC)/lang/fcfg_langpack_{$(alllangiso)}.xcd \ $(MISC)/lang/registry_{$(alllangiso)}.xcd -{$(MY_XCDS)} : $$(MY_FILES_$$(@:b)) +{$(MY_XCDS)} : $$(MY_FILES_$$(@:b):^"$(SOLARXMLDIR)/") $(MISC)/%.xcd .ERRREMOVE : $(MISC)/%.list - $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt $< + $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \ + $(SOLARENV)/bin/packregistry.xslt $< $(MISC)/%.list : makefile.mk - $(RM) $@ echo '<list>' $(foreach,i,$(MY_DEPS_$(@:b)) '<dependency file="$i"/>') \ $(foreach,i,$(MY_FILES_$(@:b)) '<filename>$i</filename>') '</list>' > $@ -$(MISC)/lang/Langpack-{$(alllangiso)}.xcd : $(MY_MOD)/$$(@:b).xcu +$(MISC)/lang/Langpack-{$(alllangiso)}.xcd : $(SOLARXMLDIR)/$(MY_MOD)/$$(@:b).xcu $(MISC)/lang/Langpack-%.xcd .ERRREMOVE : $(MKDIRHIER) $(@:d) - $(RM) $(MISC)/$(@:b).list - echo '<list><dependency file="main"/>\ - <filename>$(MY_MOD)/$(@:b).xcu</filename></list>' > $(MISC)/$(@:b).list - $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \ - $(MISC)/$(@:b).list + echo '<list><dependency file="main"/>' \ + '<filename>$(MY_MOD)/$(@:b).xcu</filename></list>' > $(MISC)/$(@:b).list + $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \ + $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list $(MISC)/lang/fcfg_langpack_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip @@ -518,8 +519,8 @@ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE : echo '<list>' $(foreach,i,$(shell cd $(MISC) && \ find $(@:b).unzip -name \*.xcu -size +0c -print) \ '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list - $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \ - $(MISC)/$(@:b).list + $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \ + $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list $(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip \ $(SOLARPCKDIR)/fcfg_drivers_$$(@:b:s/registry_//).zip @@ -537,5 +538,5 @@ $(MISC)/lang/registry_%.xcd .ERRREMOVE : echo '<list>' $(foreach,i,$(shell cd $(MISC) && \ find $(@:b).unzip fcfg_drivers_$*.unzip -name \*.xcu -print) \ '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list - $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \ - $(MISC)/$(@:b).list + $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \ + $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list |