diff options
| author | Daniel Burrows <dburrows@debian.org> | 2010-05-14 17:36:59 -0700 |
|---|---|---|
| committer | Daniel Burrows <dburrows@debian.org> | 2010-05-14 17:36:59 -0700 |
| commit | 9582221a96075d01ceebdcb8add56c74b510bcd0 (patch) | |
| tree | 9225c91690f6d9ccfb61ccdd89edc9a108c22107 | |
| parent | 9335f8b22739cc85bca547d1c21672a3aae038b0 (diff) | |
| download | aptitude-9582221a96075d01ceebdcb8add56c74b510bcd0.tar.gz | |
Move the scons-generated config.h file into build/config so it doesn't interfere with Makefile builds in the same source tree.
| -rw-r--r-- | site_scons/aptitude_configure.py | 2 | ||||
| -rw-r--r-- | site_scons/aptitude_configure_checks.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/site_scons/aptitude_configure.py b/site_scons/aptitude_configure.py index f0b708d4..4572b6bd 100644 --- a/site_scons/aptitude_configure.py +++ b/site_scons/aptitude_configure.py @@ -249,7 +249,7 @@ Returns an object with the following fields: default = '$DOCDIR/$PACKAGE', help = 'the location in which aptitude\'s documentation should be installed.') - all_build_envs = base.Clone(CPPPATH = [ '#/src' ], + all_build_envs = base.Clone(CPPPATH = [ '#/src', '#/build/config' ], CPPDEFINES = [ '_REENTRANT' ]) DoConfigureBuild(all_build_envs) diff --git a/site_scons/aptitude_configure_checks.py b/site_scons/aptitude_configure_checks.py index 2f1ce6fe..4e1b5158 100644 --- a/site_scons/aptitude_configure_checks.py +++ b/site_scons/aptitude_configure_checks.py @@ -27,7 +27,7 @@ def Configure(env): """Creates an aptitude-flavored configuration object targeting the given environment.""" - result = SCons.Script.Configure(env, custom_tests, config_h = 'src/config.h') + result = SCons.Script.Configure(env, custom_tests, config_h = 'build/config/config.h') result.Define('PACKAGE', '"%s"' % env['PACKAGE']) result.Define('VERSION', '"%s"' % env['VERSION']) # Need to inform the source code that we have a config.h file: |