From c4ade561504ced22b92f7e3e233117683b82faec Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 21 Aug 2016 15:57:38 +0300 Subject: Added sysconfdir option. Closes #694. --- mesonbuild/coredata.py | 1 + mesonbuild/mesonmain.py | 1 + 2 files changed, 2 insertions(+) (limited to 'mesonbuild') diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 7c8e458..ae3db6d 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -211,6 +211,7 @@ 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' ], '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') -- cgit v1.1 From a52154eba50a0338af423809e147cfe7da1468bd Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 21 Aug 2016 23:37:13 +0300 Subject: Change default and add explanatory comment for why we do that. --- mesonbuild/coredata.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mesonbuild') 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' ], -- cgit v1.1