aboutsummaryrefslogtreecommitdiff
path: root/meson.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-03-08 18:43:30 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2013-03-08 18:43:30 +0200
commit921bce638b4e31b2f186016a6a7ffb01d9046967 (patch)
tree528f8e3c6ada2678bb2d7e24227575cd4e945ea6 /meson.py
parent7ced6d2071fff5cba845b91d4cd8d4214d157fab (diff)
downloadmeson-921bce638b4e31b2f186016a6a7ffb01d9046967.zip
meson-921bce638b4e31b2f186016a6a7ffb01d9046967.tar.gz
meson-921bce638b4e31b2f186016a6a7ffb01d9046967.tar.bz2
A few more Windows fixes.
Diffstat (limited to 'meson.py')
-rwxr-xr-xmeson.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/meson.py b/meson.py
index 6ccc257..b313d45 100755
--- a/meson.py
+++ b/meson.py
@@ -30,7 +30,12 @@ build_types = ['plain', 'debug', 'optimized']
buildtype_help = 'build type, one of: %s' % ', '.join(build_types)
buildtype_help += ' (default: %default)'
-parser.add_option('--prefix', default='/usr/local', dest='prefix',
+if environment.is_windows():
+ def_prefix = 'c:/'
+else:
+ def_prefix = '/usr/local'
+
+parser.add_option('--prefix', default=def_prefix, dest='prefix',
help='the installation prefix (default: %default)')
parser.add_option('--libdir', default='lib', dest='libdir',
help='the installation subdir of libraries (default: %default)')
@@ -55,7 +60,7 @@ class MesonApp():
def __init__(self, dir1, dir2, script_file, options):
(self.source_dir, self.build_dir) = self.validate_dirs(dir1, dir2)
- if options.prefix[0] != '/':
+ if not os.path.isabs(options.prefix):
raise RuntimeError('--prefix must be an absolute path.')
self.meson_script_file = script_file
self.options = options