diff options
| -rwxr-xr-x | configure.py | 2 | ||||
| -rwxr-xr-x | src/scripts/cleanup.py | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/configure.py b/configure.py index f5b874505..bfd1a0102 100755 --- a/configure.py +++ b/configure.py @@ -1849,6 +1849,8 @@ def create_template_vars(source_paths, build_config, options, modules, cc, arch, 'fuzzer_output_dir': build_config.fuzzer_output_dir if build_config.fuzzer_output_dir else '', 'doc_output_dir': build_config.doc_output_dir, + 'doc_output_dir_manual': build_config.doc_output_dir_manual, + 'doc_output_dir_doxygen': build_config.doc_output_dir_doxygen, 'os': options.os, 'arch': options.arch, diff --git a/src/scripts/cleanup.py b/src/scripts/cleanup.py index 7660076dc..d2aaf4303 100755 --- a/src/scripts/cleanup.py +++ b/src/scripts/cleanup.py @@ -96,17 +96,13 @@ def main(args=None): remove_file(build_config['makefile_path']) remove_dir(build_dir) else: - for dir_type in ['libobj_dir', 'cliobj_dir', 'testobj_dir']: + for dir_type in ['libobj_dir', 'cliobj_dir', 'testobj_dir', 'doc_output_dir_manual', 'doc_output_dir_doxygen']: dir_path = build_config[dir_type] - remove_all_in_dir(dir_path) + if dir_path: + remove_all_in_dir(dir_path) remove_file(build_config['doc_stamp_file']) - try: - shutil.rmtree(build_config['doc_output_dir']) - except OSError: - pass - remove_file(build_config['cli_exe']) remove_file(build_config['test_exe']) |