diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2013-01-29 10:50:39 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2013-01-29 10:50:39 (GMT) |
| commit | 67792e7e020b0f7675fa14198af7d59b8dc6b732 (patch) | |
| tree | ad2a32359b64104b96d5e805af4061ad6f78211d | |
| parent | ddcc92b74e80bd4f1a081d2bce76b564411c87d8 (diff) | |
Fix build of modules with autogen.sh
| -rw-r--r-- | devbot/build.py | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/devbot/build.py b/devbot/build.py index 23e70e7..b30fdb3 100644 --- a/devbot/build.py +++ b/devbot/build.py @@ -138,27 +138,26 @@ def _build_autotools(module, log): source_dir = module.get_source_dir() if not os.path.exists(makefile_path): configure = os.path.join(source_dir, "autogen.sh") - - if not os.path.exists(makefile_path): + if not os.path.exists(configure): configure = os.path.join(source_dir, "configure") - if module.options: - options = module.options - elif module.options_ev: - options = [_eval_option(option) + if module.options: + options = module.options + elif module.options_ev: + options = [_eval_option(option) for option in module.options_ev] - else: - options = ["--prefix", config.prefix_dir, - "--libdir", config.lib_dir] + else: + options = ["--prefix", config.prefix_dir, + "--libdir", config.lib_dir] - options.extend(module.extra_options) - for option in module.extra_options_ev: - options.append(_eval_option(option)) + options.extend(module.extra_options) + for option in module.extra_options_ev: + options.append(_eval_option(option)) - args = [configure] - args.extend(options) + args = [configure] + args.extend(options) - command.run(args, log) + command.run(args, log) jobs = multiprocessing.cpu_count() * 2 |