diff options
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | configure.ac | 16 |
2 files changed, 28 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 28e52fee2f..56047c3971 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,9 +18,11 @@ ACLOCAL_AMFLAGS = -I m4 # Dirs of external packages -dbuspolicydir=$(sysconfdir)/dbus-1/system.d +dbuspolicydir=@dbuspolicydir@ +dbussessionservicedir=@dbussessionservicedir@ +dbussystemservicedir=@dbussystemservicedir@ +dbusinterfacedir=@dbusinterfacedir@ udevrulesdir=@udevrulesdir@ -interfacedir=$(datadir)/dbus-1/interfaces # Our own, non-special dirs pkgsysconfdir=$(sysconfdir)/systemd @@ -67,10 +69,13 @@ noinst_PROGRAMS = \ dist_dbuspolicy_DATA = \ src/org.freedesktop.systemd1.conf +dist_dbussystemservice_DATA = \ + src/org.freedesktop.systemd1.service + dist_udevrules_DATA = \ src/99-systemd.rules -interface_DATA = \ +dbusinterface_DATA = \ org.freedesktop.systemd1.Manager.xml \ org.freedesktop.systemd1.Job.xml \ org.freedesktop.systemd1.Unit.xml \ @@ -464,7 +469,7 @@ endif org.freedesktop.systemd1.%.xml: systemd $(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@ -CLEANFILES += $(interface_DATA) +CLEANFILES += $(dbusinterface_DATA) install-data-hook: $(MKDIR_P) -m 0755 \ @@ -531,6 +536,9 @@ install-data-hook: $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \ $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \ $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount ) + ( cd $(DESTDIR)$(dbussessionservicedir) && \ + rm -f org.freedesktop.systemd1.service && \ + $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service ) if TARGET_FEDORA ( cd $(DESTDIR)$(pkgsysconfdir)/system && \ rm -f display-manager.service && \ diff --git a/configure.ac b/configure.ac index af20151fbb..5a4b5e2dc8 100644 --- a/configure.ac +++ b/configure.ac @@ -263,6 +263,18 @@ AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) AC_DEFINE_UNQUOTED(SPECIAL_DBUS_SERVICE, ["$SPECIAL_DBUS_SERVICE"], [D-Bus service name]) AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog service name]) +dbuspolicydir=`pkg-config --variable=sysconfdir dbus-1`/dbus-1/system.d +AC_SUBST([dbuspolicydir], [$dbuspolicydir]) + +dbussessionservicedir=`pkg-config --variable=session_bus_services_dir dbus-1` +AC_SUBST([dbussessionservicedir], [$dbussessionservicedir]) + +dbussystemservicedir=`pkg-config --variable=session_bus_services_dir dbus-1`/../system-services +AC_SUBST([dbussystemservicedir], [$dbussystemservicedir]) + +dbusinterfacedir=`pkg-config --variable=session_bus_services_dir dbus-1`/../interfaces +AC_SUBST([dbusinterfacedir], [$dbusinterfacedir]) + AC_ARG_WITH([udevrulesdir], AS_HELP_STRING([--with-udevrulesdir=DIR], [Diectory for udev rules]), [], @@ -290,4 +302,8 @@ echo " prefix: ${prefix} root dir: ${with_rootdir} udev rules dir: ${with_udevrulesdir} + dbus policy dir: ${dbuspolicydir} + dbus session dir: ${dbussessionservicedir} + dbus system dir: ${dbussystemservicedir} + dbus interfaces dir: ${dbusinterfacedir} " |