summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-03-27 21:57:06 +0000
committerDavid Robillard <d@drobilla.net>2011-03-27 21:57:06 +0000
commit10bd8ed7ee7b61988373152a78830c2e5fdc9ac5 (patch)
treea45abf9402082220bba6e3207ae94f9814aa158b
parent7a193476907670232f103bf656f07b0ae632ef46 (diff)
downloadautowaf-10bd8ed7ee7b61988373152a78830c2e5fdc9ac5.tar.gz
autowaf-10bd8ed7ee7b61988373152a78830c2e5fdc9ac5.tar.bz2
autowaf-10bd8ed7ee7b61988373152a78830c2e5fdc9ac5.zip
Fix paths on Windows
git-svn-id: http://svn.drobilla.net/autowaf@40 e2e4594f-ea7b-45dc-bc5a-5f5301e603aa
-rw-r--r--autowaf.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/autowaf.py b/autowaf.py
index 9ed0d21..6aa0d42 100644
--- a/autowaf.py
+++ b/autowaf.py
@@ -121,6 +121,12 @@ def check_pkg(conf, name, **args):
if 'atleast_version' in args:
conf.env['VERSION_' + name] = args['atleast_version']
+def normpath(path):
+ if sys.platform == 'win32':
+ return os.path.normpath(path).replace('\\', '\\\\')
+ else:
+ return os.path.normpath(path)
+
def configure(conf):
global g_step
if g_step > 1:
@@ -139,14 +145,18 @@ def configure(conf):
conf.env['STRICT'] = Options.options.strict
conf.env['PREFIX'] = os.path.normpath(os.path.abspath(os.path.expanduser(conf.env['PREFIX'])))
+ if sys.platform == 'win32':
+ conf.env['PREFIX'] = conf.env['PREFIX'].replace('\\', '\\\\')
+
def config_dir(var, opt, default):
if opt:
- conf.env[var] = opt
+ conf.env[var] = normpath(opt)
else:
- conf.env[var] = default
+ conf.env[var] = normpath(default)
opts = Options.options
prefix = conf.env['PREFIX']
+
config_dir('BINDIR', opts.bindir, os.path.join(prefix, 'bin'))
config_dir('SYSCONFDIR', opts.configdir, os.path.join(prefix, 'etc'))
config_dir('DATADIR', opts.datadir, os.path.join(prefix, 'share'))