Merge branch 'source_root' into 'master'
build: Use meson.current_source_dir() instead of source_root() See merge request pwithnall/malcontent!78
This commit is contained in:
commit
7d9c32aa9a
|
@ -8,7 +8,7 @@ endif
|
|||
resources = gnome.compile_resources(
|
||||
'resources',
|
||||
'malcontent-ui.gresource.xml',
|
||||
source_dir: meson.source_root(),
|
||||
source_dir: meson.current_source_dir(),
|
||||
)
|
||||
|
||||
libmalcontent_ui_sources = [
|
||||
|
|
|
@ -34,8 +34,8 @@ accounts_service_iface_c = custom_target(
|
|||
)
|
||||
|
||||
accounts_service_extension_ifaces = [
|
||||
join_paths(meson.source_root(), 'accounts-service', 'com.endlessm.ParentalControls.AppFilter.xml'),
|
||||
join_paths(meson.source_root(), 'accounts-service', 'com.endlessm.ParentalControls.SessionLimits.xml'),
|
||||
join_paths(meson.current_source_dir(), '..', '..', 'accounts-service', 'com.endlessm.ParentalControls.AppFilter.xml'),
|
||||
join_paths(meson.current_source_dir(), '..', '..', 'accounts-service', 'com.endlessm.ParentalControls.SessionLimits.xml'),
|
||||
]
|
||||
|
||||
accounts_service_extension_iface_h = custom_target(
|
||||
|
|
|
@ -7,7 +7,7 @@ endif
|
|||
resources = gnome.compile_resources(
|
||||
'resources',
|
||||
'malcontent-control.gresource.xml',
|
||||
source_dir: meson.source_root(),
|
||||
source_dir: meson.current_source_dir(),
|
||||
)
|
||||
|
||||
malcontent_control = executable('malcontent-control',
|
||||
|
@ -40,7 +40,7 @@ desktop_file = i18n.merge_file('desktop-file',
|
|||
type: 'desktop',
|
||||
input: '@0@.desktop.in'.format(application_id),
|
||||
output: '@0@.desktop'.format(application_id),
|
||||
po_dir: join_paths(meson.source_root(), 'po'),
|
||||
po_dir: join_paths(meson.current_source_dir(), '..', 'po'),
|
||||
install: true,
|
||||
install_dir: join_paths(get_option('datadir'), 'applications'),
|
||||
)
|
||||
|
@ -60,7 +60,7 @@ endif
|
|||
appdata_file = i18n.merge_file('appdata-file',
|
||||
input: '@0@.appdata.xml.in'.format(application_id),
|
||||
output: '@0@.appdata.xml'.format(application_id),
|
||||
po_dir: join_paths(meson.source_root(), 'po'),
|
||||
po_dir: join_paths(meson.current_source_dir(), '..', 'po'),
|
||||
install: true,
|
||||
install_dir: join_paths(get_option('datadir'), 'metainfo'),
|
||||
)
|
||||
|
@ -97,7 +97,7 @@ endif
|
|||
policy_file = i18n.merge_file('policy-file',
|
||||
input: '@0@.policy.in'.format(application_id),
|
||||
output: '@0@.policy'.format(application_id),
|
||||
po_dir: join_paths(meson.source_root(), 'po'),
|
||||
po_dir: join_paths(meson.current_source_dir(), '..', 'po'),
|
||||
install: true,
|
||||
install_dir: join_paths(get_option('datadir'), 'polkit-1', 'actions'),
|
||||
)
|
||||
|
|
|
@ -13,8 +13,8 @@ gnome = import('gnome')
|
|||
i18n = import('i18n')
|
||||
pkgconfig = import('pkgconfig')
|
||||
|
||||
meson_make_symlink = join_paths(meson.source_root(), 'tools', 'meson-make-symlink.py')
|
||||
po_dir = join_paths(meson.source_root(), 'po')
|
||||
meson_make_symlink = join_paths(meson.current_source_dir(), 'tools', 'meson-make-symlink.py')
|
||||
po_dir = join_paths(meson.current_source_dir(), 'po')
|
||||
|
||||
prefix = get_option('prefix')
|
||||
bindir = join_paths(prefix, get_option('bindir'))
|
||||
|
|
Loading…
Reference in New Issue