--- a/sbsv2/raptor/RELEASE-NOTES.txt	Fri Mar 26 16:43:35 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt	Mon Mar 29 09:55:24 2010 +0100
@@ -14,6 +14,7 @@
 - Fix: remove unnecessary empty lines in log output in copylogfromannofile mode. 
 - SF Bug 1939 - [Raptor] PAGED keyword in MMP files should imply byte pair compressed
 - DPDEF144648 - Raptor failed to build tools_deb objects under Windows XP 
+- SF Bug 2134 - [Raptor] Raptor does not pass overridden make variables into its makefiles
 
 
 version 2.12.5

--- a/sbsv2/raptor/python/raptor_cli.py	Fri Mar 26 16:43:35 2010 +0000
+++ b/sbsv2/raptor/python/raptor_cli.py	Mon Mar 29 09:55:24 2010 +0100
@@ -34,7 +34,7 @@
 # raptor_cli module attributes
 
 parser = OptionParser(prog = raptor.name,
-					  usage = """%prog [--help] [options] [variable=value] [target] ...
+					  usage = """%prog [--help] [options] [target] ...
 
 Targets:
 
@@ -247,13 +247,8 @@
 
 	# the leftover_args are either variable assignments of the form a=b
 	# or target names.
-	regex = re.compile("^(.+)=(.*)$")
 	for leftover in leftover_args:
-		assignment = regex.findall(leftover)
-		if len(assignment) > 0:
-			Raptor.SetEnv(assignment[0][0],assignment[0][1])
-		else:
-			Raptor.AddTarget(leftover)
+		Raptor.AddTarget(leftover)
 
 	# Define the dictionary of functions to be used.
 	# Attributes and function names can be added easily.