--- a/sbsv2/raptor/lib/flm/template_ext.flm Mon Jan 25 10:01:28 2010 +0000
+++ b/sbsv2/raptor/lib/flm/template_ext.flm Mon Jan 25 10:14:33 2010 +0000
@@ -85,7 +85,6 @@
UNIQ:=$(word 1,$(shell echo $(UNIQ) | $(GNUMD5SUM)))
# Work out the other FINAL target if we're building both udeb and urel
-ifneq ($($(UNIQ)),)
ifeq ($(CFG),urel)
OTHER_CFG:=udeb
@@ -100,6 +99,7 @@
OTHER_CFG:=rel
endif
+ifneq ($($(UNIQ)_$(OTHER_CFG)),)
OTHER_MAKMAKE:=$(UNIQ)_$(OTHER_CFG)_MAKMAKE
OTHER_BLD:=$(UNIQ)_$(OTHER_CFG)_BLD
OTHER_FREEZE:=$(UNIQ)_$(OTHER_CFG)_FREEZE
@@ -111,7 +111,7 @@
endif # ifneq ($($(UNIQ)),)
# Set $($(UNIQ)) so it can be detected if we're run again
-$(UNIQ):=1
+$(UNIQ)_$(CFG):=1
tem_$(notdir $(TEMPLATE_EXTENSION_MAKEFILE))_$(PLATFORM)_$(CFG):=$(tem_$(notdir $(TEMPLATE_EXTENSION_MAKEFILE))_$(PLATFORM)_$(CFG)) $(UNIQ)_$(CFG)