From 5f27d3887b60c95cbcdefaeae5dea38f020c390e Mon Sep 17 00:00:00 2001 From: Doan Tran Cong Danh <congdanhqx@gmail.com> Date: Thu, 3 Oct 2019 12:57:55 +0700 Subject: [PATCH 2/8] allow obexd on non-systemd system --- Makefile.obexd | 6 +++--- .../{org.bluez.obex.service => org.bluez.obex.service.in} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (74%) diff --git a/Makefile.obexd b/Makefile.obexd index de59d297b..cb04bb1e2 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -1,12 +1,12 @@ if SYSTEMD systemduserunitdir = $(SYSTEMD_USERUNITDIR) systemduserunit_DATA = obexd/src/obex.service +endif 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 if OBEX @@ -107,6 +107,6 @@ obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources) $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@ -CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service +CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service obexd/src/org.bluez.obex.service EXTRA_DIST += obexd/src/genbuiltin diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service.in similarity index 74% rename from obexd/src/org.bluez.obex.service rename to obexd/src/org.bluez.obex.service.in index a53808884..543d7bc07 100644 --- a/obexd/src/org.bluez.obex.service +++ b/obexd/src/org.bluez.obex.service.in @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.bluez.obex -Exec=/bin/false +Exec=@pkglibexecdir@/obexd SystemdService=dbus-org.bluez.obex.service -- 2.23.0