openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File makefile.patch of Package dunst (Revision d45fa88653377ffb5d5cb39ebf4ed94a)

Currently displaying revision d45fa88653377ffb5d5cb39ebf4ed94a , Show latest

Index: dunst-1.3.1/Makefile
===================================================================
--- dunst-1.3.1.orig/Makefile
+++ dunst-1.3.1/Makefile
@@ -8,30 +8,7 @@ ifneq ($(wildcard ./.git/.),)
 VERSION := $(shell git describe --tags)
 endif
 
-ifeq (,${SYSTEMD})
-# Check for systemctl to avoid discrepancies on systems, where
-# systemd is installed, but systemd.pc is in another package 
-systemctl := $(shell command -v systemctl >/dev/null && echo systemctl)
-ifeq (systemctl,${systemctl})
 SYSTEMD := 1
-else
-SYSTEMD := 0
-endif
-endif
-
-SERVICEDIR_DBUS ?= $(shell pkg-config dbus-1 --variable=session_bus_services_dir)
-SERVICEDIR_DBUS := ${SERVICEDIR_DBUS}
-ifeq (,${SERVICEDIR_DBUS})
-$(error "Failed to query pkg-config for package 'dbus-1'!")
-endif
-
-ifneq (0,${SYSTEMD})
-SERVICEDIR_SYSTEMD ?= $(shell pkg-config systemd --variable=systemduserunitdir)
-SERVICEDIR_SYSTEMD := ${SERVICEDIR_SYSTEMD}
-ifeq (,${SERVICEDIR_SYSTEMD})
-$(error "Failed to query pkg-config for package 'systemd'!")
-endif
-endif
 
 LIBS := $(shell pkg-config --libs   ${pkg_config_packs})
 INCS := $(shell pkg-config --cflags ${pkg_config_packs})
@@ -134,11 +111,12 @@ install-doc:
 
 install-service: install-service-dbus
 install-service-dbus: service-dbus
-	install -Dm644 org.knopwob.dunst.service ${DESTDIR}${SERVICEDIR_DBUS}/org.knopwob.dunst.service
+	mkdir -p ${DESTDIR}${PREFIX}/share/dbus-1/services/
+	install -m644 org.knopwob.dunst.service ${DESTDIR}${PREFIX}/share/dbus-1/services
 ifneq (0,${SYSTEMD})
 install-service: install-service-systemd
 install-service-systemd: service-systemd
-	install -Dm644 dunst.systemd.service ${DESTDIR}${SERVICEDIR_SYSTEMD}/dunst.service
+	install -Dm644 dunst.systemd.service ${DESTDIR}${PREFIX}/lib/systemd/user/dunst.service
 endif
 
 uninstall: uninstall-service

Places

File makefile.patch of Package dunst (Revision d45fa88653377ffb5d5cb39ebf4ed94a)

Places