Fix the Multiple Variants example in the man page.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@221 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 9a2e9a0fb8473935d38747f68384554ff0c839a9..cadc7b89f2c7fa6517d6448d2be71c848088fbef 100644 (file)
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -1452,13 +1452,13 @@ in the build directories:
 .ES
 SConstruct:
 
-    Export("ccflags")
-
     ccflags = '-DFOO'
+    Export("ccflags")
     BuildDir('foo', 'src')
     SConscript('foo/SConscript')
 
     ccflags = '-DBAR'
+    Export("ccflags")
     BuildDir('bar', 'src')
     SConscript('bar/SConscript')
 

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index a24671106a8a303bf67d31947ff1d7ee8980d88e..bdced280e5213b9b1dca7048cd014ef63a73705d 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -29,7 +29,8 @@ RELEASE 0.04 -
   - Man page updates:  corrected some mistakes, documented various
     missing Environment methods, alphabetized the construction
     variables and other functions, defined begin and end macros for
-    the example sections, regularized white space separation.
+    the example sections, regularized white space separation, fixed
+    the use of Export() in the Multiple Variants example.
 
   - Function action fixes:  None is now a successful return value.
     Exceptions are now reported.  Document function actions.