Fixes for Windows paths. Based on Github pull 41 from cdesjardins

with some modifications by randombit.

1 files changed, 5 insertions, 3 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,