diff options
| -rw-r--r-- | mesonbuild/coredata.py | 5 | ||||
| -rw-r--r-- | mesonbuild/mesonmain.py | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 406cb4c..109bb32 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -36,11 +36,6 @@ class UserStringOption(UserOption): def validate(self, value): if not isinstance(value, str): raise MesonException('Value "%s" for string option "%s" is not a string.' % (str(value), self.name)) - if self.name == 'prefix' and not os.path.isabs(value): - raise MesonException('Prefix option value \'{0}\' must be an absolute path.'.format(value)) - if self.name in ('libdir', 'bindir', 'includedir', 'datadir', 'mandir', 'localedir') \ - and os.path.isabs(value): - raise MesonException('Option %s must not be an absolute path.' % self.name) def set_value(self, newvalue): self.validate(newvalue) diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index bc5d35a..7f7ab43 100644 --- a/mesonbuild/mesonmain.py +++ b/mesonbuild/mesonmain.py @@ -70,7 +70,7 @@ class MesonApp(): def __init__(self, dir1, dir2, script_launcher, handshake, options, original_cmd_line_args): (self.source_dir, self.build_dir) = self.validate_dirs(dir1, dir2, handshake) if not os.path.isabs(options.prefix): - raise RuntimeError('--prefix value \'{0}\' must be an absolute path: '.format(options.prefix)) + raise RuntimeError('--prefix value must be an absolute path: {!r}'.format(options.prefix)) if options.prefix.endswith('/') or options.prefix.endswith('\\'): # On Windows we need to preserve the trailing slash if the # string is of type 'C:\' because 'C:' is not an absolute path. |