diff --git a/configure.ac b/configure.ac index 015f1227..acdab97d 100644 --- a/configure.ac +++ b/configure.ac @@ -56,8 +56,6 @@ AC_DEFINE([HAVE_DBUS], [], [dbus detected]), AM_CONDITIONAL(HAVE_DBUS, test "x$dbus_enabled" != xno) if test "x$dbus_enabled" != xno;then -dbus_services_dir=$($PKG_CONFIG dbus-1 --variable=system_bus_services_dir) -AC_SUBST(DBUS_SERVICES_DIR, [$dbus_services_dir]) dbus_conf_dir=$($PKG_CONFIG dbus-1 --variable=sysconfdir) AC_SUBST(DBUS_CONFIG_DIR, [$dbus_conf_dir/etc/dbus-1/system.d/]) fi diff --git a/doc/Makefile.am b/doc/Makefile.am index 035c74c6..f18befc4 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -20,7 +20,6 @@ ocpasswd.8: ../src/ocpasswd-args.def rm -f "$<".tmp install-data-local: - -test -d "$(DBUS_SERVICES_DIR)" && $(INSTALL_DATA) dbus/org.infradead.ocserv.service $(DBUS_SERVICES_DIR) -test -d "$(DBUS_CONFIG_DIR)" && $(INSTALL_DATA) dbus/org.infradead.ocserv.conf $(DBUS_CONFIG_DIR) -test -d "/usr/lib/systemd/system/" && $(INSTALL_DATA) systemd/ocserv.service /usr/lib/systemd/system/ -test -d "/usr/lib/systemd/system/" && $(INSTALL_DATA) systemd/ocserv.socket /usr/lib/systemd/system/ diff --git a/doc/dbus/org.infradead.ocserv.service b/doc/dbus/org.infradead.ocserv.service deleted file mode 100644 index acf77a58..00000000 --- a/doc/dbus/org.infradead.ocserv.service +++ /dev/null @@ -1,5 +0,0 @@ -[D-BUS Service] -Name=org.infradead.ocserv.service -Exec=/bin/false -User=root -SystemdService=ocserv-org.infradead.ocserv.service