From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 23 Jun 2010 20:36:34 +0000 (+0200)
Subject: fix splitting of GITPATH - was ALWAYS pulling master no matter which tag was mentioned..
X-Git-Tag: 5.0-rc11~11
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=21c7f7fd7dfe686070392e6a967494655ca3bc3a;p=build.git

fix splitting of GITPATH - was ALWAYS pulling master no matter which tag was mentioned..
---

diff --git a/Makefile b/Makefile
index aea676c5..ccdb09f1 100644
--- a/Makefile
+++ b/Makefile
@@ -294,10 +294,10 @@ define stage1_module_vars
 ifneq "$($(1)-SVNPATH)" ""
 $(1)-SVNPATH := $(strip $($(1)-SVNPATH))
 else
-$(1)-GITPATH := $(strip $($(1)-GITPATH))
-$(1).gitrepo := $(firstword $(subst @, ,$($(1)-GITPATH)))
-$(1).gittag := $(word 2,$(subst @, ,$($(1)-GITPATH)))
-$(1).gittag := $(if $($(1).gittag),$($(1).gittag),master)
+$(1)-GITPATH := $$(strip $$($(1)-GITPATH))
+$(1).gitrepo := $$(firstword $$(subst @, ,$$($(1)-GITPATH)))
+$(1).gittag := $$(word 2,$$(subst @, ,$$($(1)-GITPATH)))
+$(1).gittag := $$(if $$($(1).gittag),$$($(1).gittag),master)
 endif
 endef
 
@@ -769,7 +769,7 @@ info-branches:
 
 module-tools:
 	@$(foreach module,$(ALL.modules), \
- 	 $(if $($(module)-GITPATH), \
+	 $(if $($(module)-GITPATH), \
 	  $(if $($(module)-BRANCH), \
 	     echo git:$(module):$($(module)-BRANCH); , \
 	     echo git:$(module); ), \