A few sysconf fixes.

pull/987/head
Jussi Pakkanen 8 years ago
parent 36a0d162cb
commit e0034fd6a5
  1. 4
      mesonbuild/coredata.py
  2. 11
      mesonbuild/mconf.py

@ -216,6 +216,10 @@ builtin_options = {
# 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.
#
# Projects installing to sysconfdir probably want to set the following in project():
#
# default_options : ['sysconfdir=/etc']
'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'],

@ -165,7 +165,16 @@ class Conf:
print('')
print('Directories:')
parr = []
for key in [ 'prefix', 'libdir', 'libexecdir', 'bindir', 'includedir', 'datadir', 'mandir', 'localedir' ]:
for key in ['prefix',
'libdir',
'libexecdir',
'bindir',
'includedir',
'datadir',
'mandir',
'localedir',
'sysconfdir',
]:
parr.append([key, coredata.get_builtin_option_description(key),
self.coredata.get_builtin_option(key), coredata.get_builtin_option_choices(key)])
self.print_aligned(parr)

Loading…
Cancel
Save