summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2002-01-24 06:41:19 (GMT)
committerSteven Knight <knight@baldmt.com>2002-01-24 06:41:19 (GMT)
commitcc608d24b5c4dbcd969607c8638827f97722fa25 (patch)
tree295530637accb41f3a7ffc3b04594d6c023464cf
parent4de2cf9718c2d58e0ade08945e247acbe629d656 (diff)
downloadSCons-cc608d24b5c4dbcd969607c8638827f97722fa25.zip
SCons-cc608d24b5c4dbcd969607c8638827f97722fa25.tar.gz
SCons-cc608d24b5c4dbcd969607c8638827f97722fa25.tar.bz2
Fix the Multiple Variants example in the man page.
-rw-r--r--doc/man/scons.14
-rw-r--r--src/CHANGES.txt3
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 9a2e9a0..cadc7b8 100644
--- 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 a246711..bdced28 100644
--- 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.