diff options
| author | Steven Knight <knight@baldmt.com> | 2010-01-13 02:08:38 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2010-01-13 02:08:38 (GMT) |
| commit | fdc4349e8a1ab1a8c89d5bdc30c3c97fdcdbaef8 (patch) | |
| tree | 429c9443890a948afa18c93ddd9497b8c2d455c7 /doc | |
| parent | 5580a9f84b3cb845bf823f00b4ec465524022717 (diff) | |
| download | SCons-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')
| -rw-r--r-- | doc/user/parseconfig.in | 26 | ||||
| -rw-r--r-- | doc/user/parseconfig.xml | 22 |
2 files changed, 48 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> diff --git a/doc/user/parseconfig.xml b/doc/user/parseconfig.xml index 46bd4dc..3613d77 100644 --- a/doc/user/parseconfig.xml +++ b/doc/user/parseconfig.xml @@ -76,6 +76,17 @@ </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'] @@ -107,6 +118,17 @@ print env['CPPPATH'] </programlisting> + <!-- + 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'] |