diff options
Diffstat (limited to 'extras/CustomTarget_autotextuser.mk')
| -rw-r--r-- | extras/CustomTarget_autotextuser.mk | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/extras/CustomTarget_autotextuser.mk b/extras/CustomTarget_autotextuser.mk index ce474344fd44..6b161497ebd0 100644 --- a/extras/CustomTarget_autotextuser.mk +++ b/extras/CustomTarget_autotextuser.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_CustomTarget_CustomTarget,extras/source/autotext)) +$(eval $(call gb_CustomTarget_CustomTarget,extras/source/autotext/user)) extras_AUTOTEXTUSER_AUTOTEXTS := \ mytexts \ @@ -26,19 +26,19 @@ ifneq ($(sort $(foreach file,$(extras_AUTOTEXTUSER_XMLFILES),$(firstword $(subst $(call gb_Output_error,defined user autotext do not match existing directories) endif -$(call gb_CustomTarget_get_target,extras/source/autotext) : \ - $(foreach atexts,$(extras_AUTOTEXTUSER_AUTOTEXTS),$(call gb_CustomTarget_get_workdir,extras/source/autotext)/$(atexts).bau) +$(call gb_CustomTarget_get_target,extras/source/autotext/user) : \ + $(foreach atexts,$(extras_AUTOTEXTUSER_AUTOTEXTS),$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/$(atexts).bau) -$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%/mimetype : $(SRCDIR)/extras/source/autotext/%/mimetype +$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%/mimetype : $(SRCDIR)/extras/source/autotext/%/mimetype $(call gb_Output_announce,$*/mimetype,$(true),CPY,1) cp $< $@ -$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.xml : $(SRCDIR)/extras/source/autotext/%.xml \ +$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%.xml : $(SRCDIR)/extras/source/autotext/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,$*.xml,$(true),XSL,1) $(call gb_ExternalExecutable_get_command,xsltproc) -o $@ $(SRCDIR)/extras/util/compact.xsl $< -$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.bau : +$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%.bau : $(call gb_Output_announce,$*.bau,$(true),ZIP,2) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_AUTOTEXTUSER_DIR) && \ @@ -46,20 +46,20 @@ $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.bau : ) define extras_Autotextuser_make_file_deps -$(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(SRCDIR)/$(1)/$(2) \ - | $(dir $(call gb_CustomTarget_get_workdir,$(1))/$(2)).dir +$(call gb_CustomTarget_get_workdir,$(1)/user)/$(2) : $(SRCDIR)/$(1)/$(2) \ + | $(dir $(call gb_CustomTarget_get_workdir,$(1)/user)/$(2)).dir endef define extras_Autotextuser_make_zip_deps -$(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - $(addprefix $(call gb_CustomTarget_get_workdir,$(1))/,$(filter $(3)/%,$(extras_AUTOTEXTUSER_MIMETYPEFILES) $(extras_AUTOTEXTUSER_XMLFILES))) \ - | $(dir $(call gb_CustomTarget_get_workdir,$(1))/$(2)).dir +$(call gb_CustomTarget_get_workdir,$(1)/user)/$(2) : \ + $(addprefix $(call gb_CustomTarget_get_workdir,$(1)/user)/,$(filter $(3)/%,$(extras_AUTOTEXTUSER_MIMETYPEFILES) $(extras_AUTOTEXTUSER_XMLFILES))) \ + | $(dir $(call gb_CustomTarget_get_workdir,$(1)/user)/$(2)).dir -$(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ +$(call gb_CustomTarget_get_workdir,$(1)/user)/$(2) : \ EXTRAS_AUTOTEXTUSER_FILES := $(foreach file,$(filter $(3)/%,$(extras_AUTOTEXTUSER_MIMETYPEFILES) $(extras_AUTOTEXTUSER_XMLFILES)),$(subst $(3)/,,$(file))) -$(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - EXTRAS_AUTOTEXTUSER_DIR := $(call gb_CustomTarget_get_workdir,$(1))/$(3) +$(call gb_CustomTarget_get_workdir,$(1)/user)/$(2) : \ + EXTRAS_AUTOTEXTUSER_DIR := $(call gb_CustomTarget_get_workdir,$(1)/user)/$(3) endef |