diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-01 00:11:35 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-02 12:11:47 -0700 |
| commit | e0034fd6a56a01aa8005ea5efd0473c337d90edc (patch) | |
| tree | e6882d0a3146821e83874ddd00fa4f45597425e4 | |
| parent | 36a0d162cb65ee6470ed3d6b5e610de8f93b7a9d (diff) | |
| download | meson-e0034fd6a56a01aa8005ea5efd0473c337d90edc.zip meson-e0034fd6a56a01aa8005ea5efd0473c337d90edc.tar.gz meson-e0034fd6a56a01aa8005ea5efd0473c337d90edc.tar.bz2 | |
A few sysconf fixes.
| -rw-r--r-- | mesonbuild/coredata.py | 4 | ||||
| -rw-r--r-- | mesonbuild/mconf.py | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index eb6f06d..c8ee13f 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -216,6 +216,10 @@ builtin_options = { # uses that. Instead they always set it manually to /etc. This default # value is thus pointless and not really used but we set it to this # for consistency with other systems. + # + # Projects installing to sysconfdir probably want to set the following in project(): + # + # default_options : ['sysconfdir=/etc'] 'sysconfdir' : [ UserStringOption, 'Sysconf data directory.', 'etc' ], 'werror' : [ UserBooleanOption, 'Treat warnings as errors.', False ], 'warning_level' : [ UserComboOption, 'Compiler warning level to use.', [ '1', '2', '3' ], '1'], diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py index 25f2c6b..4ef8d92 100644 --- a/mesonbuild/mconf.py +++ b/mesonbuild/mconf.py @@ -165,7 +165,16 @@ class Conf: print('') print('Directories:') parr = [] - for key in [ 'prefix', 'libdir', 'libexecdir', 'bindir', 'includedir', 'datadir', 'mandir', 'localedir' ]: + for key in ['prefix', + 'libdir', + 'libexecdir', + 'bindir', + 'includedir', + 'datadir', + 'mandir', + 'localedir', + 'sysconfdir', + ]: parr.append([key, coredata.get_builtin_option_description(key), self.coredata.get_builtin_option(key), coredata.get_builtin_option_choices(key)]) self.print_aligned(parr) |