Index: tools/config.py
===================================================================
--- tools/config.py	(revision ae318d3535cba06a6996f270db31a961fae402ad)
+++ tools/config.py	(revision 06da55b579d4404672ea2a8664146ec81c2b9df2)
@@ -258,6 +258,6 @@
 				outdf.write(' -D%s' % varname)
 		else:
-			outmc.write('/* %s */\n#define %s %s\n\n' % (name, varname, default))
-			outdf.write(' -D%s=%s' % (varname, default))
+			outmc.write('/* %s */\n#define %s %s\n#define %s_%s\n\n' % (name, varname, default, varname, default))
+			outdf.write(' -D%s=%s -D%s_%s' % (varname, default, varname, default))
 	
 	outmk.write('REVISION = %s\n' % revision)