diff -r d4759a94678c -r 8c18887ce5b0 SConstruct
--- a/SConstruct	Mon Feb 28 04:50:43 2011 -0800
+++ b/SConstruct	Mon Feb 28 04:51:53 2011 -0800
@@ -338,20 +338,23 @@
     ('UPDATE_REF', 'Update test reference outputs', False)
     )
 
+# Update main environment with values from ARGUMENTS & global_sticky_vars_file
+global_sticky_vars.Update(main)
+global_nonsticky_vars.Update(main)
+global_help_texts = {
+    "global_sticky" : global_sticky_vars.GenerateHelpText(main),
+    "global_nonsticky" : global_nonsticky_vars.GenerateHelpText(main)
+}
 
 # base help text
 help_text = '''
 Usage: scons [scons options] [build options] [target(s)]
 
 Global sticky options:
-'''
-
-# Update main environment with values from ARGUMENTS & global_sticky_vars_file
-global_sticky_vars.Update(main)
-global_nonsticky_vars.Update(main)
-
-help_text += global_sticky_vars.GenerateHelpText(main)
-help_text += global_nonsticky_vars.GenerateHelpText(main)
+%(global_sticky)s
+Global nonsticky options:
+%(global_nonsticky)s
+''' % global_help_texts
 
 # Save sticky variable settings back to current variables file
 global_sticky_vars.Save(global_sticky_vars_file, main)