From 745e6b9664e75e82cd4b8817f4e89ce709609a7a Mon Sep 17 00:00:00 2001
From: Steven Knight <knight@baldmt.com>
Date: Fri, 16 Dec 2005 12:32:37 +0000
Subject: Add mention of LIBSUFFIXES in the SharedLibrary() example for
 overriding SHLIBSUFFIX.

---
 doc/man/scons.1                        | 11 +++++++++--
 src/CHANGES.txt                        |  3 +++
 src/engine/SCons/Platform/__init__.xml | 12 ++++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index b5199be..b2fec58 100644
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -1352,12 +1352,19 @@ libraries for just one program:
 env.Program('hello', 'hello.c', LIBS=['gl', 'glut'])
 .EE
 
-or generate a shared library with a nonstandard suffix:
+or generate a shared library with a non-standard suffix:
 
 .ES
-env.SharedLibrary('word', 'word.cpp', SHLIBSUFFIX='.ocx')
+env.SharedLibrary('word', 'word.cpp',
+                  SHLIBSUFFIX='.ocx',
+                  LIBSUFFIXES=['.ocx'])
 .EE
 
+(Note that both the $SHLIBSUFFIX and $LIBSUFFIXES variables must be set
+if you want SCons to search automatically
+for dependencies on the non-standard library names;
+see the descriptions of these variables, below, for more information.)
+
 Although the builder methods defined by
 .B scons
 are, in fact,
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 0833bf8..db48e3f 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -405,6 +405,9 @@ RELEASE 0.97 - XXX
     be /usr/sbin/pgkchk (since /usr/sbin isn't usually on the external
     execution $PATH).
 
+  - Fix a man page example of overriding variables when calling
+    SharedLibrary() to also set the $LIBSUFFIXES variable.
+
   From Chen Lee:
 
   - Handle Visual Studio project and solution files in Unicode.
diff --git a/src/engine/SCons/Platform/__init__.xml b/src/engine/SCons/Platform/__init__.xml
index 0cdd62b..a74df5a 100644
--- a/src/engine/SCons/Platform/__init__.xml
+++ b/src/engine/SCons/Platform/__init__.xml
@@ -25,7 +25,11 @@ to reflect the names of the libraries they create.
 
 <cvar name="LIBPREFIXES">
 <summary>
-An array of legal prefixes for library file names.
+A list of all legal prefixes for library file names.
+When searching for library dependencies,
+SCons will look for files with these prefixes,
+the base library name,
+and suffixes in the &cv-LIBSUFFIXES; list.
 </summary>
 </cvar>
 
@@ -42,7 +46,11 @@ to reflect the names of the libraries they create.
 
 <cvar name="LIBSUFFIXES">
 <summary>
-An array of legal suffixes for library file names.
+A list of all legal suffixes for library file names.
+When searching for library dependencies,
+SCons will look for files with prefixes, in the &cv-LIBPREFIXES; list,
+the base library name,
+and these suffixes.
 </summary>
 </cvar>
 
-- 
cgit v0.12