diff options
Diffstat (limited to 'doc/user/parseconfig.in')
| -rw-r--r-- | doc/user/parseconfig.in | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/doc/user/parseconfig.in b/doc/user/parseconfig.in index db97c35..667601f 100644 --- a/doc/user/parseconfig.in +++ b/doc/user/parseconfig.in @@ -1,6 +1,6 @@ <!-- - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation + Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -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> |