Skip to content

Commit e69225f

Browse files
authored
meson: Use built-in symlink creation method (#356)
1 parent ad5cf3f commit e69225f

3 files changed

Lines changed: 12 additions & 19 deletions

File tree

accountsservice/meson.build

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,14 @@ act_interfacesdir = act_dep.get_variable(
2121
default_value: datadir /'accountsservice' / 'interfaces'
2222
)
2323

24-
meson.add_install_script(
25-
symlink,
26-
dbus_interfaces_dir / 'io.elementary.pantheon.AccountsService.xml',
27-
act_interfacesdir / 'io.elementary.pantheon.AccountsService.xml',
24+
act_file_path = fs.relative_to(
25+
dbus_interfaces_dir / 'io.elementary.pantheon.AccountsService.xml',
26+
act_interfacesdir
27+
)
28+
29+
install_symlink(
30+
'io.elementary.pantheon.AccountsService.xml',
31+
install_dir : act_interfacesdir,
32+
install_tag : 'runtime',
33+
pointing_to : act_file_path,
2834
)

meson.build

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
project(
22
'elementary-default-settings',
33
version: '8.1.0',
4-
meson_version: '>= 0.58.0'
4+
meson_version: '>= 1.3.0'
55
)
66

7+
fs = import('fs')
78
gnome = import('gnome')
89
prefix = get_option('prefix')
910
datadir = prefix / get_option('datadir')
@@ -12,8 +13,6 @@ schemadir = datadir / 'glib-2.0' / 'schemas'
1213

1314
gnome.post_install(glib_compile_schemas: true)
1415

15-
symlink = meson.current_source_dir () / 'meson' / 'create-symlink.sh'
16-
1716
# Sudo password feedback in terminals
1817
install_data(
1918
'sudoers.d/pwfeedback',

meson/create-symlink.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)