[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[Michael Stahl]

 postprocess/CustomTarget_registry.mk |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit da011e057e036c3f042bfdd64fed703ead9d9ec9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 5 17:01:36 2015 +0200

    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 at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 5681889..5fa8eda 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -568,13 +568,15 @@ postprocess_main_SED := \
 	-e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g' \
 	-e 's,$${SYSTEM_LIBEXTTEXTCAT_DATA},$(SYSTEM_LIBEXTTEXTCAT_DATA),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) > $@ \
 	)