diff options
| author | Christian Mauderer <oss@c-mauderer.de> | 2017-08-11 07:27:13 +0200 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2017-08-20 08:35:10 +1000 |
| commit | 8d2dbd37b6cb743c40248b3118f4259ee2c6202e (patch) | |
| tree | 1ed43a11c2bba6661beba3836caba60564d5a6a7 /waf_generator.py | |
| parent | waf_generator: Copy headers if necessary. (diff) | |
| download | rtems-libbsd-8d2dbd37b6cb743c40248b3118f4259ee2c6202e.tar.bz2 | |
waf: Move glob operator ** to builder.py
This allows a finer decision which headers should be installed.
Diffstat (limited to 'waf_generator.py')
| -rwxr-xr-x | waf_generator.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/waf_generator.py b/waf_generator.py index fdc2210f..8aa2e290 100755 --- a/waf_generator.py +++ b/waf_generator.py @@ -457,7 +457,7 @@ class ModuleManager(builder.ModuleManager): self.add(' for headers in header_build_copy_paths:') self.add(' target = os.path.join("%s", headers[2])' % (builder.buildInclude())) self.add(' start_dir = bld.path.find_dir(headers[0])') - self.add(' for header in start_dir.ant_glob(os.path.join("**/", headers[1])):') + self.add(' for header in start_dir.ant_glob(headers[1]):') self.add(' relsourcepath = header.path_from(start_dir)') self.add(' targetheader = os.path.join(target, relsourcepath)') self.add(' bld(features = \'subst\',') @@ -648,7 +648,7 @@ class ModuleManager(builder.ModuleManager): self.add(' ipath = os.path.join(rtems.arch_bsp_include_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), headers[2])') self.add(' start_dir = bld.path.find_dir(headers[0])') self.add(' bld.install_files("${PREFIX}/" + ipath,') - self.add(' start_dir.ant_glob("**/" + headers[1]),') + self.add(' start_dir.ant_glob(headers[1]),') self.add(' cwd = start_dir,') self.add(' relative_trick = True)') self.add('') |