http://scons.tigris.org/issues/show_bug.cgi?id=2345

[scons.git] / doc / user / variants.in

diff --git a/doc/user/variants.in b/doc/user/variants.in
index 82d938b96d52c2a1dc1a57399b3efbe29a7c6bc5..9980b1dd36fc6ef9241f8f0dc5f3498794688a47 100644 (file)
--- a/doc/user/variants.in
+++ b/doc/user/variants.in
@@ -49,7 +49,8 @@ is pretty smart about rebuilding things when you change options.
 
   <para>
 
-  The &BuildDir; function now gives us everything
+  The &variant_dir; keyword argument of
+  the &SConscript; function provides everything
   we need to show how easy it is to create
   variant builds using &SCons;.
   Suppose, for example, that we want to
@@ -78,12 +79,7 @@ is pretty smart about rebuilding things when you change options.
 
     Export('env')
 
-    env.SConscript('src/SConscript', build_dir='build/$PLATFORM')
-
-    #
-    #BuildDir("#build/$PLATFORM", 'src')
-    #SConscript("build/$PLATFORM/hello/SConscript")
-    #SConscript("build/$PLATFORM/world/SConscript")
+    env.SConscript('src/SConscript', variant_dir='build/$PLATFORM')
     </file>
     <directory name="src"></directory>
     <directory name="src/hello"></directory>
@@ -125,7 +121,7 @@ is pretty smart about rebuilding things when you change options.
   </para>
 
   <scons_output example="ex_variants" os="posix">
-    <command>scons -Q OS=linux</command>
+    <scons_output_command>scons -Q OS=linux</scons_output_command>
   </scons_output>
 
   <para>
@@ -135,7 +131,7 @@ is pretty smart about rebuilding things when you change options.
   </para>
 
   <scons_output example="ex_variants" os="win32">
-    <command>scons -Q OS=windows</command>
+    <scons_output_command>scons -Q OS=windows</scons_output_command>
   </scons_output>
 
   <!--
@@ -144,12 +140,12 @@ is pretty smart about rebuilding things when you change options.
     <file name="SConstruct" printme="1">
     env = Environment(OS = ARGUMENTS.get('OS'))
     for os in ['newell', 'post']:
-        SConscript('src/SConscript', build_dir='build/' + os)
+        SConscript('src/SConscript', variant_dir='build/' + os)
     </file>
   </scons_example>
 
   <scons_output example="ex_var2">
-    <command>scons -Q</command>
+    <scons_output_command>scons -Q</scons_output_command>
   </scons_output>
 
   -->