diff options
| author | Laurent BP <laurent.balland-poirier@laposte.net> | 2019-05-01 20:48:46 +0200 |
|---|---|---|
| committer | Laurent BP <laurent.balland-poirier@laposte.net> | 2019-05-14 20:42:01 +0200 |
| commit | afb4db718438515a5514b9247f912f970add90c7 (patch) | |
| tree | a3879f05191df75b523c5b487e0e9867cae54fdd /extras/CustomTarget_tploffimisc.mk | |
| parent | 35ab83872f184c22c5f52f43ee38d3669340b192 (diff) | |
tdf#125010 No compression to mimetype in all embded files
same change as change https://gerrit.libreoffice.org/71473/
for :
- autocorrection files .DAT
- autotext share files .BAU
- autotext user file .BAU
- Writer templates: OfficeCorr, OfficeMisc, Personal, Styles .OTT
- Impress templates .OTP
Change-Id: Ie467b19bc833006fdfef45a72b9cb4a0eba8e7bd
Reviewed-on: https://gerrit.libreoffice.org/71830
Tested-by: Jenkins
Reviewed-by: Laurent BP <laurent.balland-poirier@laposte.net>
Diffstat (limited to 'extras/CustomTarget_tploffimisc.mk')
| -rw-r--r-- | extras/CustomTarget_tploffimisc.mk | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/extras/CustomTarget_tploffimisc.mk b/extras/CustomTarget_tploffimisc.mk index 79d4262ff466..4a1fc666e31f 100644 --- a/extras/CustomTarget_tploffimisc.mk +++ b/extras/CustomTarget_tploffimisc.mk @@ -24,43 +24,43 @@ extras_OFFIMISC_XMLFILES := \ Businesscard-with-logo/Thumbnails/thumbnail.png \ -extras_TPLOFFIMISC_MIMETYPEFILES := $(foreach atexts,$(extras_TEMPLATES_OFFIMISC),$(atexts)/mimetype) +extras_OFFIMISC_MIMETYPEFILES := $(foreach atexts,$(extras_TEMPLATES_OFFIMISC),$(atexts)/mimetype) $(call gb_CustomTarget_get_target,extras/source/templates/offimisc) : \ $(foreach atexts,$(extras_TEMPLATES_OFFIMISC),$(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/$(atexts).ott) $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%/mimetype : $(SRCDIR)/extras/source/templates/offimisc/%/mimetype - $(call gb_Output_announce,$*/mimetype,$(true),CPY,1) + $(call gb_Output_announce,templates/offimisc/$*/mimetype,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.jpg : $(SRCDIR)/extras/source/templates/offimisc/%.jpg - $(call gb_Output_announce,$*.jpg,$(true),CPY,1) + $(call gb_Output_announce,templates/offimisc/$*.jpg,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.png : $(SRCDIR)/extras/source/templates/offimisc/%.png - $(call gb_Output_announce,$*.png,$(true),CPY,1) + $(call gb_Output_announce,templates/offimisc/$*.png,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.rdf : $(SRCDIR)/extras/source/templates/offimisc/%.rdf - $(call gb_Output_announce,$*.rdf,$(true),CPY,1) + $(call gb_Output_announce,templates/offimisc/$*.rdf,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.svg : $(SRCDIR)/extras/source/templates/offimisc/%.svg - $(call gb_Output_announce,$*.svg,$(true),CPY,1) + $(call gb_Output_announce,templates/offimisc/$*.svg,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.svm : $(SRCDIR)/extras/source/templates/offimisc/%.svm - $(call gb_Output_announce,$*.svm,$(true),CPY,1) + $(call gb_Output_announce,templates/offimisc/$*.svm,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.xml : $(SRCDIR)/extras/source/templates/offimisc/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) - $(call gb_Output_announce,$*.xml,$(true),XSL,1) + $(call gb_Output_announce,templates/offimisc/$*.xml,$(true),XSL,1) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.ott : - $(call gb_Output_announce,$*.ott,$(true),ZIP,2) + $(call gb_Output_announce,templates/offimisc/$*.ott,$(true),ZIP,2) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_OFFIMISC_DIR) && \ zip -q0X --filesync --must-match $@ $(EXTRAS_OFFIMISC_MIMEFILES_FILTER) && \ @@ -75,11 +75,11 @@ endef define extras_Tploffimisc_make_zip_deps $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - $(addprefix $(call gb_CustomTarget_get_workdir,$(1))/,$(filter $(3)/%,$(extras_TPLOFFIMISC_MIMETYPEFILES) $(extras_OFFIMISC_XMLFILES))) \ + $(addprefix $(call gb_CustomTarget_get_workdir,$(1))/,$(filter $(3)/%,$(extras_OFFIMISC_MIMETYPEFILES) $(extras_OFFIMISC_XMLFILES))) \ | $(dir $(call gb_CustomTarget_get_workdir,$(1))/$(2)).dir $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - EXTRAS_OFFIMISC_MIMEFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_TPLOFFIMISC_MIMETYPEFILES)),$(subst $(3)/,,$(file))) + EXTRAS_OFFIMISC_MIMEFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_OFFIMISC_MIMETYPEFILES)),$(subst $(3)/,,$(file))) $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ EXTRAS_OFFIMISC_XMLFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_OFFIMISC_XMLFILES)),$(subst $(3)/,,$(file))) $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ @@ -87,7 +87,7 @@ $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ endef -$(eval $(foreach file,$(extras_TPLOFFIMISC_MIMETYPEFILES) $(extras_OFFIMISC_XMLFILES),\ +$(eval $(foreach file,$(extras_OFFIMISC_MIMETYPEFILES) $(extras_OFFIMISC_XMLFILES),\ $(call extras_Tploffimisc_make_file_deps,extras/source/templates/offimisc,$(file)) \ )) |