From 0d2d2b20d4effc73b557ae48af61c6cb6e8a2b49 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Sun, 10 Sep 2023 18:59:07 +0300 Subject: [PATCH] Makefile: properly handle dbus & systemd services --- Makefile | 9 +++++---- org.freedesktop.impl.portal.desktop.hyprland.service | 4 ---- org.freedesktop.impl.portal.desktop.hyprland.service.in | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 org.freedesktop.impl.portal.desktop.hyprland.service diff --git a/Makefile b/Makefile index 3d76318..8bf6ee9 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,8 @@ debug: install: $(MAKE) release - cp ./build/hyprland-share-picker/hyprland-share-picker ${PREFIX}/bin - cp ./build/xdg-desktop-portal-hyprland ${LIBEXEC}/ - cp ./hyprland.portal ${SHARE}/xdg-desktop-portal/portals/ - cp ./org.freedesktop.impl.portal.desktop.hyprland.service ${SHARE}/dbus-1/services/ \ No newline at end of file + cp -f ./build/hyprland-share-picker/hyprland-share-picker ${PREFIX}/bin + cp -f ./build/xdg-desktop-portal-hyprland ${LIBEXEC}/ + cp -f ./hyprland.portal ${SHARE}/xdg-desktop-portal/portals/ + sed "s|@libexecdir@|${LIBEXEC}|g" ./org.freedesktop.impl.portal.desktop.hyprland.service.in > ${SHARE}/dbus-1/services/org.freedesktop.impl.portal.desktop.hyprland + sed "s|@libexecdir@|${LIBEXEC}|g" ./contrib/systemd/xdg-desktop-portal-hyprland.service.in > ${LIBEXEC}/systemd/user/xdg-desktop-portal-hyprland.service diff --git a/org.freedesktop.impl.portal.desktop.hyprland.service b/org.freedesktop.impl.portal.desktop.hyprland.service deleted file mode 100644 index 2a83e66..0000000 --- a/org.freedesktop.impl.portal.desktop.hyprland.service +++ /dev/null @@ -1,4 +0,0 @@ -[D-BUS Service] -Name=org.freedesktop.impl.portal.desktop.hyprland -Exec=/usr/lib/xdg-desktop-portal-hyprland -SystemdService=xdg-desktop-portal-hyprland.service \ No newline at end of file diff --git a/org.freedesktop.impl.portal.desktop.hyprland.service.in b/org.freedesktop.impl.portal.desktop.hyprland.service.in index cb1f305..bb00b18 100644 --- a/org.freedesktop.impl.portal.desktop.hyprland.service.in +++ b/org.freedesktop.impl.portal.desktop.hyprland.service.in @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.freedesktop.impl.portal.desktop.hyprland Exec=@libexecdir@/xdg-desktop-portal-hyprland -@systemd_service@ +SystemdService=xdg-desktop-portal-hyprland.service