diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:09:57 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:09:57 +0200 |
| commit | d0ca4d81abb4d55fd9b3e7da3e4ed710e755fcb6 (patch) | |
| tree | 92a8810cac19151a77f51230928b08917b58d8c4 /postprocess/packregistry/makefile.mk | |
| parent | d992f0d2be4b60651a427e53405b01945f16b764 (diff) | |
| parent | 9edb428b1e8f2a250158b1f57d25ea6388a6125d (diff) | |
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
postprocess/packcomponents/makefile.mk
postprocess/prj/build.lst
Diffstat (limited to 'postprocess/packregistry/makefile.mk')
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 335639d3a0d9..71ee36db0e79 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -516,14 +516,16 @@ $(MISC)/lang/fcfg_langpack_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip # It can happen that localized $(SOLARPCKDIR)/fcfg_langpack_*.zip contain # zero-sized org/openoffice/TypeDectection/Filter.xcu; filter them out in the # find shell command below (see issue 110041): + $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE : $(MKDIRHIER) $(@:d) rm -rf $(MISC)/$(@:b).unzip mkdir $(MISC)/$(@:b).unzip cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip - $(RM) $(MISC)/$(@:b).list + # filter out filenames starting with "." echo '<list>' $(foreach,i,$(shell cd $(MISC) && \ - find $(@:b).unzip -name \*.xcu -size +0c -print) \ + find $(@:b).unzip -name \[!.\]\*.xcu -size +0c -print) \ '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \ $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list @@ -541,8 +543,9 @@ $(MISC)/lang/registry_%.xcd .ERRREMOVE : cd $(MISC)/fcfg_drivers_$*.unzip && \ unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip - $(RM) $(MISC)/$(@:b).list + # filter out filenames starting with "." echo '<list>' $(foreach,i,$(shell cd $(MISC) && \ - find $(@:b).unzip fcfg_drivers_$*.unzip -name \*.xcu -print) \ + find $(@:b).unzip fcfg_drivers_$*.unzip -name \[!.\]\*.xcu -print) \ '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \ $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list |