summaryrefslogtreecommitdiffstats
path: root/doc/user/parseconfig.in
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2010-01-13 02:08:38 (GMT)
committerSteven Knight <knight@baldmt.com>2010-01-13 02:08:38 (GMT)
commitfdc4349e8a1ab1a8c89d5bdc30c3c97fdcdbaef8 (patch)
tree429c9443890a948afa18c93ddd9497b8c2d455c7 /doc/user/parseconfig.in
parent5580a9f84b3cb845bf823f00b4ec465524022717 (diff)
downloadSCons-fdc4349e8a1ab1a8c89d5bdc30c3c97fdcdbaef8.zip
SCons-fdc4349e8a1ab1a8c89d5bdc30c3c97fdcdbaef8.tar.gz
SCons-fdc4349e8a1ab1a8c89d5bdc30c3c97fdcdbaef8.tar.bz2
Capture the previous output from "pkg-config x11" in a static
screen section. Ubuntu Karmic changed the X11 package config so it no longer prints a -I option, and this is just an example anyway.
Diffstat (limited to 'doc/user/parseconfig.in')
-rw-r--r--doc/user/parseconfig.in26
1 files changed, 26 insertions, 0 deletions
diff --git a/doc/user/parseconfig.in b/doc/user/parseconfig.in
index e5cc564..2dbefff 100644
--- a/doc/user/parseconfig.in
+++ b/doc/user/parseconfig.in
@@ -78,9 +78,22 @@
</para>
+ <!--
+ This is how we used to generate the screen output below, but
+ as of (at least) Ubuntu Karmic, the pkg-config output for x11
+ no longer reports back an include directory. Since this is just
+ for example anyway, we're just hard-coding the output.
+
<scons_output example="ParseConfig1">
<scons_output_command>scons -Q</scons_output_command>
</scons_output>
+ -->
+
+ <screen>
+ % <userinput>scons -Q</userinput>
+ ['/lib/compat', '/usr/X11/include']
+ scons: `.' is up to date.
+ </screen>
<para>
@@ -109,6 +122,19 @@
</file>
</scons_example>
+ <!--
+ This is how we used to generate the screen output below, but
+ as of (at least) Ubuntu Karmic, the pkg-config output for x11
+ no longer reports back an include directory. Since this is just
+ for example anyway, we're just hard-coding the output.
+
<scons_output example="ParseConfig2">
<scons_output_command>scons -Q</scons_output_command>
</scons_output>
+ -->
+
+ <screen>
+ % <userinput>scons -Q</userinput>
+ ['/usr/X11/include']
+ scons: `.' is up to date.
+ </screen>