Merge pull request #700 from mesonbuild/sysconfdir

Added sysconfdir option. Closes #694.
pull/717/head
Jussi Pakkanen 8 years ago committed by GitHub
commit d3ce0a4395
  1. 5
      mesonbuild/coredata.py
  2. 1
      mesonbuild/mesonmain.py

@ -211,6 +211,11 @@ builtin_options = {
'datadir' : [ UserStringOption, 'Data file directory.', 'share' ], 'datadir' : [ UserStringOption, 'Data file directory.', 'share' ],
'mandir' : [ UserStringOption, 'Manual page directory.', 'share/man' ], 'mandir' : [ UserStringOption, 'Manual page directory.', 'share/man' ],
'localedir' : [ UserStringOption, 'Locale data directory.', 'share/locale' ], 'localedir' : [ UserStringOption, 'Locale data directory.', 'share/locale' ],
# 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 ], 'werror' : [ UserBooleanOption, 'Treat warnings as errors.', False ],
'warning_level' : [ UserComboOption, 'Compiler warning level to use.', [ '1', '2', '3' ], '1'], 'warning_level' : [ UserComboOption, 'Compiler warning level to use.', [ '1', '2', '3' ], '1'],
'layout' : [ UserComboOption, 'Build directory layout.', ['mirror', 'flat' ], 'mirror' ], 'layout' : [ UserComboOption, 'Build directory layout.', ['mirror', 'flat' ], 'mirror' ],

@ -47,6 +47,7 @@ add_builtin_argument('includedir')
add_builtin_argument('datadir') add_builtin_argument('datadir')
add_builtin_argument('mandir') add_builtin_argument('mandir')
add_builtin_argument('localedir') add_builtin_argument('localedir')
add_builtin_argument('sysconfdir')
add_builtin_argument('backend') add_builtin_argument('backend')
add_builtin_argument('buildtype') add_builtin_argument('buildtype')
add_builtin_argument('strip', action='store_true') add_builtin_argument('strip', action='store_true')

Loading…
Cancel
Save