summaryrefslogtreecommitdiff
path: root/doc/generated/variables.gen
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2019-08-12 08:46:24 -0600
committerMats Wichmann <mats@linux.com>2019-09-07 13:17:06 -0600
commit06d79e6c3ba463f1254ce12edad54c7fe94679a7 (patch)
tree2723b56f205c41d4c6e99b0dce29cb50276f6b2b /doc/generated/variables.gen
parenta9d0c090c02491d7dec0e54688e9a819d0229732 (diff)
downloadscons-git-06d79e6c3ba463f1254ce12edad54c7fe94679a7.tar.gz
manpage: clarify that tools=[list] overrides [ci skip]
Also some formatting tweaks, and a couple of typos. The description of the default tool now lists some of what that may include. Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'doc/generated/variables.gen')
-rw-r--r--doc/generated/variables.gen22
1 files changed, 11 insertions, 11 deletions
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index 7be9c63e1..8f0951236 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -4011,7 +4011,7 @@ The command line used to pass files to the Microsoft IDL compiler.
<listitem>
<para xmlns="http://www.scons.org/dbxsd/v1.0">
The string displayed when
-the Microsoft IDL copmiler is called.
+the Microsoft IDL compiler is called.
If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MIDLCOM"><envar>$MIDLCOM</envar></link> (the command line) is displayed.
</para>
</listitem>
@@ -6518,16 +6518,6 @@ Example <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION">
</para>
</listitem>
</varlistentry>
- <varlistentry id="cv-SHLIBVERSIONFLAGS">
- <term>SHLIBVERSIONFLAGS</term>
- <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Extra flags added to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLINKCOM"><envar>$SHLINKCOM</envar></link> when building versioned
-<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-SharedLibrary"><function>SharedLibrary</function></link>. These flags are only used when <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is
-set.
-</para>
-</listitem>
- </varlistentry>
<varlistentry id="cv-_SHLIBVERSIONFLAGS">
<term>_SHLIBVERSIONFLAGS</term>
<listitem>
@@ -6541,6 +6531,16 @@ and some extra dynamically generated options (such as
</para>
</listitem>
</varlistentry>
+ <varlistentry id="cv-SHLIBVERSIONFLAGS">
+ <term>SHLIBVERSIONFLAGS</term>
+ <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Extra flags added to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLINKCOM"><envar>$SHLINKCOM</envar></link> when building versioned
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-SharedLibrary"><function>SharedLibrary</function></link>. These flags are only used when <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is
+set.
+</para>
+</listitem>
+ </varlistentry>
<varlistentry id="cv-SHLINK">
<term>SHLINK</term>
<listitem>