--- a/sbsv2/raptor/python/raptor_make.py	Wed Jul 14 16:22:24 2010 +0800
+++ b/sbsv2/raptor/python/raptor_make.py	Wed Jul 14 14:50:01 2010 +0100
@@ -270,6 +270,14 @@
 				time="$(shell date +%s.%N)").rstrip("\n") + ")"
 
 
+		# Debugging on or off for make:
+		# We need it at the very top level so that it can be used
+		# to determine what extra info to put in recipe tags
+		try:
+			flmdebug_setting = os.environ["FLMDEBUG"]
+		except KeyError:
+			flmdebug_setting = ""
+
 		self.makefile_prologue = """
 
 # generated by %s %s
@@ -283,6 +291,7 @@
 DELETE_ON_FAILED_COMPILE:=%s 
 
 %s
+FLMDEBUG:=%s
 
 include %s
 
@@ -294,6 +303,7 @@
 			 self.shellpath,
 			 self.delete_on_failed_compile,
 			 talon_settings,
+			 flmdebug_setting,
 			 self.raptor.systemFLM.Append('globals.mk') )
 
 		# Unless dependency processing has been eschewed via the CLI, use a .DEFAULT target to