diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-08-21 15:57:38 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-08-21 15:57:38 +0300 |
| commit | c4ade561504ced22b92f7e3e233117683b82faec (patch) | |
| tree | cd8b71870a6bc1024a9ffa511d86baef8203fce9 | |
| parent | fae8ad90a45e61caaec7e74c510ac092dc347098 (diff) | |
| download | meson-c4ade561504ced22b92f7e3e233117683b82faec.zip meson-c4ade561504ced22b92f7e3e233117683b82faec.tar.gz meson-c4ade561504ced22b92f7e3e233117683b82faec.tar.bz2 | |
Added sysconfdir option. Closes #694.
| -rw-r--r-- | mesonbuild/coredata.py | 1 | ||||
| -rw-r--r-- | mesonbuild/mesonmain.py | 1 | ||||
| -rw-r--r-- | test cases/common/12 data/meson.build | 2 |
3 files changed, 3 insertions, 1 deletions
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') diff --git a/test cases/common/12 data/meson.build b/test cases/common/12 data/meson.build index 80f3835..bd1fbf6 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 : '/etc') +install_data(sources : 'etcfile.dat', install_dir : get_option('sysconfdir')) subdir('vanishing') |