diff --git a/accountsservice/meson.build b/accountsservice/meson.build index c6d8a42..79a7181 100644 --- a/accountsservice/meson.build +++ b/accountsservice/meson.build @@ -21,8 +21,14 @@ act_interfacesdir = act_dep.get_variable( default_value: datadir /'accountsservice' / 'interfaces' ) -meson.add_install_script( - symlink, - dbus_interfaces_dir / 'io.elementary.pantheon.AccountsService.xml', - act_interfacesdir / 'io.elementary.pantheon.AccountsService.xml', +act_file_path = fs.relative_to( + dbus_interfaces_dir / 'io.elementary.pantheon.AccountsService.xml', + act_interfacesdir +) + +install_symlink( + 'io.elementary.pantheon.AccountsService.xml', + install_dir : act_interfacesdir, + install_tag : 'runtime', + pointing_to : act_file_path, ) diff --git a/meson.build b/meson.build index 72b536a..2e66a56 100644 --- a/meson.build +++ b/meson.build @@ -1,9 +1,10 @@ project( 'elementary-default-settings', version: '8.1.0', - meson_version: '>= 0.58.0' + meson_version: '>= 1.3.0' ) +fs = import('fs') gnome = import('gnome') prefix = get_option('prefix') datadir = prefix / get_option('datadir') @@ -12,8 +13,6 @@ schemadir = datadir / 'glib-2.0' / 'schemas' gnome.post_install(glib_compile_schemas: true) -symlink = meson.current_source_dir () / 'meson' / 'create-symlink.sh' - # Sudo password feedback in terminals install_data( 'sudoers.d/pwfeedback', diff --git a/meson/create-symlink.sh b/meson/create-symlink.sh deleted file mode 100644 index cdd5214..0000000 --- a/meson/create-symlink.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -eu - -# this is needed mostly because $DESTDIR is provided as a variable, -# and we need to create the target directory... - -mkdir -vp "$(dirname "${DESTDIR:-}$2")" -if [ "$(dirname $1)" = . -o "$(dirname $1)" = .. ]; then - ln -vfs -T -- "$1" "${DESTDIR:-}$2" -else - ln -vfs -T --relative -- "${DESTDIR:-}$1" "${DESTDIR:-}$2" -fi