29 lines
1 KiB
Text
29 lines
1 KiB
Text
--- SConstruct 2007-12-21 22:00:22.000000000 -0500
|
||
+++ SConstruct 2007-12-21 22:03:19.000000000 -0500
|
||
@@ -409,7 +409,7 @@
|
||
not (os.path.exists('config.py') and os.path.exists('config.h')) and \
|
||
not GetOption('clean'):
|
||
opts = DefineOptions(None, ARGUMENTS)
|
||
- env = Environment(options = opts)
|
||
+ env = Environment(ENV = os.environ, options = opts)
|
||
Help(opts.GenerateHelpText(env))
|
||
|
||
opts.Update(env)
|
||
@@ -422,7 +422,8 @@
|
||
if os.environ.has_key('PKG_CONFIG_PATH'):
|
||
env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH']
|
||
|
||
- env['CPPPATH'] += ['.', 'src/']
|
||
+ env['CPPPATH'] = Split(env['CPPPATH'])
|
||
+ env['LIBPATH'] = Split(env['LIBPATH'])
|
||
|
||
config_h_defines = []
|
||
|
||
@@ -510,7 +511,6 @@
|
||
|
||
config_h = open('config.h', 'w')
|
||
config_h.write('#define VERSION "0.7.2"\n')
|
||
- config_h.write('#define ENABLE_BINRELOC 1\n')
|
||
config_h.write('#define ICONV_CONST %s\n' % iconv_const)
|
||
for (v,k) in config_h_defines:
|
||
config_h.write('#define %s %s\n' % (v, k))
|