summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-08-05 17:01:36 +0200
committerEike Rathke <erack@redhat.com>2015-08-06 13:19:48 +0000
commitf9ab9cc39573a0caf6f725ee3097f19ffe7fbf98 (patch)
treeaee498d12e04a561073aa55d1e1378560cc45629
parent884856481774a6e6eb3e350bf76b3900c2e62b0d (diff)
postprocess: try to get the right version number in About dialog
Add a dependency from main.xcd to config_host.mk to rebuild it when the version number changes. Change-Id: I6878d58def57942f117b0b6e49a6c03abbeca5af Reviewed-on: https://gerrit.libreoffice.org/17539 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit da011e057e036c3f042bfdd64fed703ead9d9ec9) Reviewed-on: https://gerrit.libreoffice.org/17541
-rw-r--r--postprocess/CustomTarget_registry.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 35de59e5ba11..420ffe650e22 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -567,13 +567,15 @@ postprocess_main_SED := \
-e 's,$${STARTCENTER_HIDE_EXTERNAL_LINKS},0,g' \
-e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g' \
-$(call gb_XcdTarget_get_target,main.xcd) : \
+$(call gb_XcdTarget_get_target,main.xcd) \
+ : $(SRCDIR)/config_host.mk.stamp \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,main,$(true),XCD,3)
$(call gb_Helper_abbreviate_dirs, \
mkdir -p $(dir $@) && \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
- $(SRCDIR)/solenv/bin/packregistry.xslt $< \
+ $(SRCDIR)/solenv/bin/packregistry.xslt \
+ $(call gb_CustomTarget_get_workdir,postprocess/registry)/main.list \
| sed $(postprocess_main_SED) > $@ \
)