diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-08-21 23:37:13 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-08-21 23:37:13 +0300 |
| commit | a52154eba50a0338af423809e147cfe7da1468bd (patch) | |
| tree | ef3adefe8b7e8c6602c454471dc08668606bf3ba | |
| parent | c4ade561504ced22b92f7e3e233117683b82faec (diff) | |
| download | meson-a52154eba50a0338af423809e147cfe7da1468bd.zip meson-a52154eba50a0338af423809e147cfe7da1468bd.tar.gz meson-a52154eba50a0338af423809e147cfe7da1468bd.tar.bz2 | |
Change default and add explanatory comment for why we do that.
| -rw-r--r-- | mesonbuild/coredata.py | 6 | ||||
| -rw-r--r-- | test cases/common/12 data/meson.build | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index ae3db6d..2f1875f 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -211,7 +211,11 @@ builtin_options = { 'datadir' : [ UserStringOption, 'Data file directory.', 'share' ], 'mandir' : [ UserStringOption, 'Manual page directory.', 'share/man' ], 'localedir' : [ UserStringOption, 'Locale data directory.', 'share/locale' ], - 'sysconfdir' : [ UserStringOption, 'Sysconf data directory.', '/etc' ], + # Sysconfdir is a bit special. It defaults to ${prefix}/etc but nobody + # 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. + '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'], 'layout' : [ UserComboOption, 'Build directory layout.', ['mirror', 'flat' ], 'mirror' ], diff --git a/test cases/common/12 data/meson.build b/test cases/common/12 data/meson.build index bd1fbf6..80f3835 100644 --- a/test cases/common/12 data/meson.build +++ b/test cases/common/12 data/meson.build @@ -1,6 +1,6 @@ project('data install test', 'c') install_data(sources : 'datafile.dat', install_dir : 'share/progname') -install_data(sources : 'etcfile.dat', install_dir : get_option('sysconfdir')) +install_data(sources : 'etcfile.dat', install_dir : '/etc') subdir('vanishing') |