diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2017-10-20 16:54:10 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2017-10-28 23:27:36 +0100 |
| commit | 24549dbed5fe733b89fb0e45e76e8389e0a67b40 (patch) | |
| tree | 3f224bc3e43f05b635ac0e7d00f1dd19ab19f005 /mesonbuild/mesonmain.py | |
| parent | 426b258d91e8a933754a3f058838a25422f6a8a1 (diff) | |
| download | meson-24549dbed5fe733b89fb0e45e76e8389e0a67b40.zip meson-24549dbed5fe733b89fb0e45e76e8389e0a67b40.tar.gz meson-24549dbed5fe733b89fb0e45e76e8389e0a67b40.tar.bz2 | |
Make sysconfdir, localstatedir and sharedstatedir defaults depend on prefix
Rather than requiring a bit of boilerplate in every meson.build, which is
only documented in a comment in mesoncore.py, use sensible defaults for
sysconfdir, localstatedir and sharedstatedir depending on the prefix.
Fixes #1637
v2:
For clarity, give get_builtin_option_default() a noneIfSuppress argument,
rather than overloading prefix '' and None with special meanings.
Diffstat (limited to 'mesonbuild/mesonmain.py')
| -rw-r--r-- | mesonbuild/mesonmain.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index 45e6026..12d8530 100644 --- a/mesonbuild/mesonmain.py +++ b/mesonbuild/mesonmain.py @@ -37,7 +37,12 @@ def add_builtin_argument(name, **kwargs): h = h.rstrip('.') + ' (default: %s).' % coredata.get_builtin_option_default(k) if c and not b: kwargs['choices'] = c - parser.add_argument('--' + name, default=coredata.get_builtin_option_default(k), help=h, **kwargs) + default = coredata.get_builtin_option_default(k, noneIfSuppress=True) + if default is not None: + kwargs['default'] = default + else: + kwargs['default'] = argparse.SUPPRESS + parser.add_argument('--' + name, help=h, **kwargs) add_builtin_argument('prefix') add_builtin_argument('libdir') |