[Libreoffice-commits] core.git: solenv/gbuild

[Michael Stahl]

 solenv/gbuild/AutoInstall.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c998206afaace817b8c6a5ea4a661af68fa5fdcc
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Feb 16 13:57:32 2016 +0100

    gbuild: add missing commas to fix build with make < 4.0
    
    (regression from c33fb4828e2fda2648f11614a20ce0172d4af3db)
    
    Change-Id: I8d20343401cab13a3b6721d0d3016edaeb7dd898

diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index ebf3e30a..1d999d6 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -15,7 +15,7 @@ endef
 
 define gb_AutoInstall__make_define
 echo "#define auto_$*_ALL \ " >> $@
-$(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo "    $(call gb_AutoInstall__escape$(binary)), \ " >> $@;)
+$(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo "    $(call gb_AutoInstall__escape,$(binary)), \ " >> $@;)
 echo "    $(call gb_AutoInstall__escape,$(lastword $(1)))" >> $@;
 echo "" >> $@
 endef
@@ -50,7 +50,7 @@ ifeq ($(HAVE_GNUMAKE_FILE_FUNC),)
 		$(foreach jar,$(gb_Jar_MODULE_$*),auto_$*_jar_$(jar)) \
 		$(foreach pkg,$(gb_Package_MODULE_$*),auto_$*_pkg_$(pkg)))
 	$(foreach lib,$(gb_Library_MODULE_$*),\
-		echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(call gb_AutoInstall__escape$(lib)),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;)
+		echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(call gb_AutoInstall__escape,$(lib)),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;)
 else
 	$(file >$@,/* autogenerated installs for group $* */)
 	$(call gb_AutoInstall__gen_define,\