[Libreoffice-commits] core.git: Makefile.in

[Luboš Luňák]

 Makefile.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 35720eac8b8aa7e7abf56f448b44d118f35a6a2d
Author: Luboš Luňák <l.lu...@collabora.com>
Date:   Sun Mar 23 21:20:00 2014 +0100

    fix $(MAKE) usage in a make define
    
    $(FOO) is expanded already during the $call, $$(FOO) will become $(FOO).
    
    Change-Id: Ia5d6966c16c57e4ec688f2c7623315cc2c74c78d

diff --git a/Makefile.in b/Makefile.in
index 718ac38..4fcb163 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -64,13 +64,13 @@ define gb_Top_GbuildModuleRules
 .PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).showdeliverables 
$(1).subsequentcheck
 
 $(1): bootstrap fetch
-       cd $(SRCDIR)/$(2) && $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS)
+       cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS)
 
 $(1).build $(1).check $(1).clean $(1).showdeliverables $(1).subsequentcheck:
-       cd $(SRCDIR)/$(2) && $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) 
$$(patsubst $(1).%,%,$$@)
+       cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) 
$$(patsubst $(1).%,%,$$@)
 
 $(1).all: bootstrap fetch
-       $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if 
$(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) 
$(WORKDIR)/Module/slowcheck/$(1))
+       $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if 
$(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) 
$(WORKDIR)/Module/slowcheck/$(1))
 
 endef
 

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits