diff options
| -rwxr-xr-x | configure.py | 8 | ||||
| -rw-r--r-- | src/build-data/makefile/gmake.in | 2 | ||||
| -rw-r--r-- | src/build-data/makefile/header.in | 2 | ||||
| -rw-r--r-- | src/build-data/makefile/nmake.in | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/configure.py b/configure.py index ccb6f854d..626a40c8d 100755 --- a/configure.py +++ b/configure.py @@ -165,7 +165,7 @@ class BuildConfigurationInformation(object): sphinx += '%s %s' return sphinx else: - return '$(COPY) %s/*.rst %s' + return '$(COPY) %s' + os.sep + '*.rst %s' doc_cmd = get_doc_cmd() @@ -176,7 +176,7 @@ class BuildConfigurationInformation(object): yield cmd_for('manual') if options.with_doxygen: - yield 'doxygen %s/botan.doxy' % (self.build_dir) + yield 'doxygen %s' + os.sep + 'botan.doxy' % (self.build_dir) self.build_doc_commands = '\n'.join(['\t' + s for s in build_doc_commands()]) @@ -1220,7 +1220,7 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): 'makefile_path': prefix_with_build_dir('Makefile'), - 'program_suffix': options.program_suffix or '', + 'program_suffix': options.program_suffix or ('' if options.os != 'windows' else '.exe'), 'prefix': options.prefix or osinfo.install_root, 'destdir': options.destdir or options.prefix or osinfo.install_root, @@ -1232,6 +1232,8 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): 'out_dir': options.with_build_dir or os.path.curdir, 'build_dir': build_config.build_dir, + 'scripts_dir': os.path.join(build_config.src_dir, 'scripts'), + 'with_shared_lib': options.build_shared_lib, 'appobj_dir': build_config.appobj_dir, diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in index be8947cf1..86d2d3569 100644 --- a/src/build-data/makefile/gmake.in +++ b/src/build-data/makefile/gmake.in @@ -60,7 +60,7 @@ distclean: clean docs: %{build_doc_commands} -install: $(LIBRARIES) docs +install: $(APP) docs $(SCRIPTS_DIR)/install.py --destdir=%{destdir} --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} website: diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in index d01b8a28a..6594cab69 100644 --- a/src/build-data/makefile/header.in +++ b/src/build-data/makefile/header.in @@ -16,7 +16,7 @@ LIB_FLAGS = $(SO_OBJ_FLAGS) $(LANG_FLAGS) $(LIB_OPT) $(WARN_FLAGS) APP_FLAGS = $(LANG_FLAGS) $(APP_OPT) $(WARN_FLAGS) TEST_FLAGS = $(LANG_FLAGS) $(APP_OPT) $(WARN_FLAGS) -SCRIPTS_DIR = src/scripts +SCRIPTS_DIR = %{scripts_dir} # Version Numbers VERSION = %{version} diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index 6ce3a536e..8359a1eb6 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -72,5 +72,5 @@ distclean: clean $(RMDIR) %{build_dir} $(RM) Makefile $(LIBNAME).* $(APP).* -install: $(LIBRARIES) docs - $(SCRIPTS_DIR)/install.py --destdir=%{destdir} --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} +install: $(APP) docs + $(SCRIPTS_DIR)\install.py --destdir=%{destdir} --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} |