Merge pull request #1209 from mesonbuild/ignatenko/dirs

Add various directories
pull/1217/head
Jussi Pakkanen 8 years ago committed by GitHub
commit e918497c78
  1. 3
      data/macros.meson
  2. 15
      mesonbuild/coredata.py
  3. 3
      mesonbuild/mconf.py
  4. 3
      mesonbuild/mesonmain.py

@ -12,12 +12,15 @@
--libdir=%{_libdir} \\\
--libexecdir=%{_libexecdir} \\\
--bindir=%{_bindir} \\\
--sbindir=%{_sbindir} \\\
--includedir=%{_includedir} \\\
--datadir=%{_datadir} \\\
--mandir=%{_mandir} \\\
--infodir=%{_infodir} \\\
--localedir=%{_datadir}/locale \\\
--sysconfdir=%{_sysconfdir} \\\
--localstatedir=%{_localstatedir} \\\
--sharedstatedir=%{_sharedstatedir} \\\
%{_vpath_srcdir} %{_vpath_builddir} \\\
%{nil}

@ -208,21 +208,24 @@ builtin_options = {
'libdir' : [ UserStringOption, 'Library directory.', default_libdir() ],
'libexecdir' : [ UserStringOption, 'Library executable directory.', default_libexecdir() ],
'bindir' : [ UserStringOption, 'Executable directory.', 'bin' ],
'sbindir' : [ UserStringOption, 'System executable directory.', 'sbin' ],
'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.
# 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' ],

@ -169,12 +169,15 @@ class Conf:
'libdir',
'libexecdir',
'bindir',
'sbindir',
'includedir',
'datadir',
'mandir',
'infodir',
'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)])

@ -41,12 +41,15 @@ add_builtin_argument('prefix')
add_builtin_argument('libdir')
add_builtin_argument('libexecdir')
add_builtin_argument('bindir')
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')
add_builtin_argument('sharedstatedir')
add_builtin_argument('backend')
add_builtin_argument('buildtype')
add_builtin_argument('strip', action='store_true')

Loading…
Cancel
Save