add support for $sharedstatedir

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
pull/1209/head
Igor Gnatenko 8 years ago
parent 2962d3a66b
commit 5bf22c5678
  1. 1
      data/macros.meson
  2. 13
      mesonbuild/coredata.py
  3. 1
      mesonbuild/mconf.py
  4. 1
      mesonbuild/mesonmain.py

@ -20,6 +20,7 @@
--localedir=%{_datadir}/locale \\\
--sysconfdir=%{_sysconfdir} \\\
--localstatedir=%{_localstatedir} \\\
--sharedstatedir=%{_sharedstatedir} \\\
%{_vpath_srcdir} %{_vpath_builddir} \\\
%{nil}

@ -214,17 +214,18 @@ builtin_options = {
'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.
# This default values is thus pointless and not really used but we set it to this
# for consistency with other systems.
# sysconfdir, localstatedir and sharedstatedir are a bit special. These defaults to ${prefix}/etc,
# ${prefix}/var and ${prefix}/com but nobody uses that. Instead they always set it
# manually to /etc, /var and /var/lib. This default values is thus pointless and not really used
# but we set it to this for consistency with other systems.
#
# Projects installing to sysconfdir and/or localstatedir probably want
# Projects installing to sysconfdir, localstatedir or sharedstatedir probably want
# to set the following in project():
#
# default_options : ['sysconfdir=/etc', 'localstatedir=/var']
# default_options : ['sysconfdir=/etc', 'localstatedir=/var', 'sharedstatedir=/var/lib']
'sysconfdir' : [ UserStringOption, 'Sysconf data directory.', 'etc' ],
'localstatedir' : [ UserStringOption, 'Localstate data directory.', 'var' ],
'sharedstatedir' : [ UserStringOption, 'Architecture-independent data directory.', 'com' ],
'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' ],

@ -177,6 +177,7 @@ class Conf:
'localedir',
'sysconfdir',
'localstatedir',
'sharedstatedir',
]:
parr.append([key, coredata.get_builtin_option_description(key),
self.coredata.get_builtin_option(key), coredata.get_builtin_option_choices(key)])

@ -49,6 +49,7 @@ add_builtin_argument('infodir')
add_builtin_argument('localedir')
add_builtin_argument('sysconfdir')
add_builtin_argument('localstatedir')
add_builtin_argument('sharedstatedir')
add_builtin_argument('backend')
add_builtin_argument('buildtype')
add_builtin_argument('strip', action='store_true')

Loading…
Cancel
Save