[Libreoffice-commits] core.git: odk/build-examples_common.mk

Rene Engelhard rene at debian.org
Fri Apr 27 15:23:15 UTC 2018


 odk/build-examples_common.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eb0524839521e563ed8f9fc17a8117a0cf74da34
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Apr 27 12:11:34 2018 +0200

    build-examples_common.mk: quote gb_Output_announce to not announce it to early
    
    Change-Id: I2f515b0647db020179374c66b8ff756e250665b2
    Reviewed-on: https://gerrit.libreoffice.org/53559
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Rene Engelhard <rene at debian.org>

diff --git a/odk/build-examples_common.mk b/odk/build-examples_common.mk
index c0142d3c633b..c0c5e0e8b8a6 100644
--- a/odk/build-examples_common.mk
+++ b/odk/build-examples_common.mk
@@ -7,7 +7,7 @@ $(call gb_CustomTarget_get_target,$(1)): \
 ifneq ($(gb_SUPPRESS_TESTS),)
 	@true
 else
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$(1)),$(true),CHK,1)
+	$$(call gb_Output_announce,$(subst $(WORKDIR)/,,$(1)),$(true),CHK,1)
 	rm -fr $(call gb_CustomTarget_get_workdir,$(1))/{out,user}
 ifeq (MACOSX,$(OS))
 	$(eval ODK_BUILD_SHELL := $(shell $(gb_MKTEMP)))
@@ -37,7 +37,7 @@ $(call gb_CustomTarget_get_workdir,$(1))/setsdkenv: \
 	$(SRCDIR)/odk/config/setsdkenv_unix.sh.in \
 	$(BUILDDIR)/config_$(gb_Side).mk | \
 	$(call gb_CustomTarget_get_workdir,$(1))/.dir
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$(1)),$(true),SED,1)
+	$$(call gb_Output_announce,$(subst $(WORKDIR)/,,$(1)),$(true),SED,1)
 	sed -e 's!@OO_SDK_NAME@!sdk!' \
 	-e 's!@OO_SDK_HOME@!$(INSTDIR)/$(SDKDIRNAME)!' \
 	-e 's!@OFFICE_HOME@!$(INSTROOTBASE)!' -e 's!@OO_SDK_MAKE_HOME@!!' \


More information about the Libreoffice-commits mailing list