add support for $sbindir

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

@ -12,6 +12,7 @@
--libdir=%{_libdir} \\\ --libdir=%{_libdir} \\\
--libexecdir=%{_libexecdir} \\\ --libexecdir=%{_libexecdir} \\\
--bindir=%{_bindir} \\\ --bindir=%{_bindir} \\\
--sbindir=%{_sbindir} \\\
--includedir=%{_includedir} \\\ --includedir=%{_includedir} \\\
--datadir=%{_datadir} \\\ --datadir=%{_datadir} \\\
--mandir=%{_mandir} \\\ --mandir=%{_mandir} \\\

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

@ -169,6 +169,7 @@ class Conf:
'libdir', 'libdir',
'libexecdir', 'libexecdir',
'bindir', 'bindir',
'sbindir',
'includedir', 'includedir',
'datadir', 'datadir',
'mandir', 'mandir',

@ -41,6 +41,7 @@ add_builtin_argument('prefix')
add_builtin_argument('libdir') add_builtin_argument('libdir')
add_builtin_argument('libexecdir') add_builtin_argument('libexecdir')
add_builtin_argument('bindir') add_builtin_argument('bindir')
add_builtin_argument('sbindir')
add_builtin_argument('includedir') add_builtin_argument('includedir')
add_builtin_argument('datadir') add_builtin_argument('datadir')
add_builtin_argument('mandir') add_builtin_argument('mandir')

Loading…
Cancel
Save