change names

[build.git] / Makefile

diff --git a/Makefile b/Makefile
index aea676c..8b3410b 100644 (file)
--- 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,10 +769,10 @@ 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); ), \
+            echo $(module):$($(module)-BRANCH); , \
+            echo $(module); ), \
          $(if $($(module)-BRANCH), \
             echo $(module):$($(module)-BRANCH); , \
             echo $(module); )))
@@ -781,6 +781,9 @@ info: info-packages info-modules info-branches
 
 .PHONY: info info-packages info-modules info-branches module-tools
 
+show-multi-modules:
+       @$(foreach package,$(ALL),$(if $(subst x1,,x$(words $($(package)-MODULES))), echo p=$(package) mods=$($(package)-MODULES) ;))
+.PHONY: show-multi-modules
 ####################
 help:
        @echo "********** Run make in two stages:"