diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-08-24 22:23:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 22:23:59 +0300 |
| commit | d3ce0a43954d41554882914372b13a15d76c70d5 (patch) | |
| tree | 8a13dbf46b143746dc49ecacfac85c496ecc72fa | |
| parent | bf2ec8fd8f03a484fecfebf017f9aaf60f2ba607 (diff) | |
| parent | a52154eba50a0338af423809e147cfe7da1468bd (diff) | |
| download | meson-d3ce0a43954d41554882914372b13a15d76c70d5.zip meson-d3ce0a43954d41554882914372b13a15d76c70d5.tar.gz meson-d3ce0a43954d41554882914372b13a15d76c70d5.tar.bz2 | |
Merge pull request #700 from mesonbuild/sysconfdir
Added sysconfdir option. Closes #694.
| -rw-r--r-- | mesonbuild/coredata.py | 5 | ||||
| -rw-r--r-- | mesonbuild/mesonmain.py | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 7c8e458..2f1875f 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -211,6 +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 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/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index e002d9a..65d979b 100644 --- a/mesonbuild/mesonmain.py +++ b/mesonbuild/mesonmain.py @@ -47,6 +47,7 @@ add_builtin_argument('includedir') add_builtin_argument('datadir') add_builtin_argument('mandir') add_builtin_argument('localedir') +add_builtin_argument('sysconfdir') add_builtin_argument('backend') add_builtin_argument('buildtype') add_builtin_argument('strip', action='store_true') |