build: Drop join_paths() in favor of /

This commit is contained in:
Christopher Davis 2022-08-05 00:21:23 -04:00
parent 8fd63ab9b7
commit d443107146
4 changed files with 18 additions and 18 deletions

View file

@ -1,19 +1,19 @@
scalable_dir = join_paths('hicolor', 'scalable', 'apps')
scalable_dir = 'hicolor' / 'scalable' / 'apps'
install_data(
join_paths(scalable_dir, 'org.gnome.Loupe.svg'),
install_dir: join_paths(iv_datadir, 'icons', scalable_dir),
scalable_dir / 'org.gnome.Loupe.svg',
install_dir: iv_datadir / 'icons' / scalable_dir,
)
install_data(
join_paths(scalable_dir, 'org.gnome.Loupe.Devel.svg'),
install_dir: join_paths(iv_datadir, 'icons', scalable_dir),
scalable_dir / 'org.gnome.Loupe.Devel.svg',
install_dir: iv_datadir / 'icons' / scalable_dir,
)
symbolic_dir = join_paths('hicolor', 'symbolic', 'apps')
symbolic_dir = 'hicolor' / 'symbolic' / 'apps'
install_data(
join_paths(symbolic_dir, 'org.gnome.Loupe-symbolic.svg'),
install_dir: join_paths(iv_datadir, 'icons', symbolic_dir),
symbolic_dir / 'org.gnome.Loupe-symbolic.svg',
install_dir: iv_datadir / 'icons' / symbolic_dir,
rename: '@0@-symbolic.svg'.format(app_id)
)

View file

@ -8,7 +8,7 @@ desktop_file = i18n.merge_file(
type: 'desktop',
po_dir: '../po',
install: true,
install_dir: join_paths(iv_datadir, 'applications')
install_dir: iv_datadir / 'applications'
)
configure_file(
@ -16,7 +16,7 @@ configure_file(
output: '@0@.service'.format(app_id),
configuration: conf,
install: true,
install_dir: join_paths(iv_datadir, 'dbus-1', 'services')
install_dir: iv_datadir / 'dbus-1' / 'services'
)
desktop_utils = find_program('desktop-file-validate', required: false)
@ -35,7 +35,7 @@ appstream_file = i18n.merge_file(
output: '@0@.appdata.xml'.format(app_id),
po_dir: '../po',
install: true,
install_dir: join_paths(iv_datadir, 'appdata')
install_dir: iv_datadir / 'appdata'
)
# appstream_util = find_program('appstream-util', required: false)
@ -46,7 +46,7 @@ appstream_file = i18n.merge_file(
# endif
install_data('org.gnome.Loupe.gschema.xml',
install_dir: join_paths(iv_datadir, 'glib-2.0', 'schemas')
install_dir: iv_datadir / 'glib-2.0' / 'schemas'
)
compile_schemas = find_program('glib-compile-schemas', required: false)