[Libreoffice-commits] core.git: external/liblangtag

Stephan Bergmann sbergman at redhat.com
Thu Apr 12 14:55:01 UTC 2018


 external/liblangtag/ExternalProject_liblangtag.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cf215a627ccf106cc5de2575f145c769ab6c4d73
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Apr 12 13:41:17 2018 +0200

    Missing quoting
    
    ...so the $ are not eaten by the sub-make
    
    Change-Id: Ifa9383a5d31720be517c03631224f5244f112d3d
    Reviewed-on: https://gerrit.libreoffice.org/52775
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/liblangtag/ExternalProject_liblangtag.mk b/external/liblangtag/ExternalProject_liblangtag.mk
index a2c3cbf39b59..963cf5a0d6da 100644
--- a/external/liblangtag/ExternalProject_liblangtag.mk
+++ b/external/liblangtag/ExternalProject_liblangtag.mk
@@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,liblangtag,build):
 			REAL_CC_FLAGS="$(filter -%,$(CC))") \
 		   $(if $(verbose),V=1) \
 		   $(MAKE) \
-                LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,liblangtag)/liblangtag/.libs))' \
+                LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,liblangtag)/liblangtag/.libs)))' \
 		$(if $(filter MACOSX,$(OS)),\
 			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl URELIB \
 				$(EXTERNAL_WORKDIR)/liblangtag/.libs/liblangtag.1.dylib \


More information about the Libreoffice-commits mailing list