diff options
| author | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2016-12-18 00:01:07 +0100 |
|---|---|---|
| committer | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2016-12-18 00:01:27 +0100 |
| commit | 2962d3a66b81695a9d7646df254e034e0f3cc956 (patch) | |
| tree | ee04fb739401a0a28dc0094428239e1c3339580b | |
| parent | 380b362fa40767ea12e6c7b523f2bc33524f0c22 (diff) | |
| download | meson-2962d3a66b81695a9d7646df254e034e0f3cc956.zip meson-2962d3a66b81695a9d7646df254e034e0f3cc956.tar.gz meson-2962d3a66b81695a9d7646df254e034e0f3cc956.tar.bz2 | |
add support for $infodir
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
| -rw-r--r-- | data/macros.meson | 1 | ||||
| -rw-r--r-- | mesonbuild/coredata.py | 1 | ||||
| -rw-r--r-- | mesonbuild/mconf.py | 1 | ||||
| -rw-r--r-- | mesonbuild/mesonmain.py | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/data/macros.meson b/data/macros.meson index 0313071..66c452c 100644 --- a/data/macros.meson +++ b/data/macros.meson @@ -16,6 +16,7 @@ --includedir=%{_includedir} \\\ --datadir=%{_datadir} \\\ --mandir=%{_mandir} \\\ + --infodir=%{_infodir} \\\ --localedir=%{_datadir}/locale \\\ --sysconfdir=%{_sysconfdir} \\\ --localstatedir=%{_localstatedir} \\\ diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index d51af02..22e5729 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -212,6 +212,7 @@ builtin_options = { 'includedir' : [ UserStringOption, 'Header file directory.', 'include' ], 'datadir' : [ UserStringOption, 'Data file directory.', 'share' ], 'mandir' : [ UserStringOption, 'Manual page directory.', 'share/man' ], + 'infodir' : [ UserStringOption, 'Info page directory.', 'share/info' ], 'localedir' : [ UserStringOption, 'Locale data directory.', 'share/locale' ], # sysconfdir and localstatedir are a bit special. These defaults to ${prefix}/etc and # ${prefix}/var but nobody uses that. Instead they always set it manually to /etc and /var. diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py index 7221dfa..e57480f 100644 --- a/mesonbuild/mconf.py +++ b/mesonbuild/mconf.py @@ -173,6 +173,7 @@ class Conf: 'includedir', 'datadir', 'mandir', + 'infodir', 'localedir', 'sysconfdir', 'localstatedir', diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index 50ab02b..2311187 100644 --- a/mesonbuild/mesonmain.py +++ b/mesonbuild/mesonmain.py @@ -45,6 +45,7 @@ add_builtin_argument('sbindir') add_builtin_argument('includedir') add_builtin_argument('datadir') add_builtin_argument('mandir') +add_builtin_argument('infodir') add_builtin_argument('localedir') add_builtin_argument('sysconfdir') add_builtin_argument('localstatedir') |