summaryrefslogtreecommitdiffstats
path: root/source/n/bluez/bluez-5.30-obexd_without_systemd-1.patch
diff options
context:
space:
mode:
Diffstat (limited to 'source/n/bluez/bluez-5.30-obexd_without_systemd-1.patch')
-rw-r--r--source/n/bluez/bluez-5.30-obexd_without_systemd-1.patch14
1 files changed, 6 insertions, 8 deletions
diff --git a/source/n/bluez/bluez-5.30-obexd_without_systemd-1.patch b/source/n/bluez/bluez-5.30-obexd_without_systemd-1.patch
index 749787c5b..fd2616178 100644
--- a/source/n/bluez/bluez-5.30-obexd_without_systemd-1.patch
+++ b/source/n/bluez/bluez-5.30-obexd_without_systemd-1.patch
@@ -16,24 +16,22 @@ directly, and to do so it needs the full path of the daemon.
delete mode 100644 obexd/src/org.bluez.obex.service
create mode 100644 obexd/src/org.bluez.obex.service.in
-diff --git a/Makefile.obexd b/Makefile.obexd
-index 3760867..142e7c3 100644
---- a/Makefile.obexd
-+++ b/Makefile.obexd
-@@ -2,12 +2,12 @@
+--- ./Makefile.obexd.orig 2019-09-19 13:51:02.000000000 -0500
++++ ./Makefile.obexd 2019-09-20 14:10:10.647348607 -0500
+@@ -1,12 +1,12 @@
if SYSTEMD
- systemduserunitdir = @SYSTEMD_USERUNITDIR@
+ systemduserunitdir = $(SYSTEMD_USERUNITDIR)
systemduserunit_DATA = obexd/src/obex.service
+endif
- dbussessionbusdir = @DBUS_SESSIONBUSDIR@
+ dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
dbussessionbus_DATA = obexd/src/org.bluez.obex.service
-endif
-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
- obex_plugindir = $(libdir)/obex/plugins
+ if OBEX
diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
deleted file mode 100644