X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=Makefile;h=236fd3cdb110ec33a62e41cfdec78aa2a9679d07;hp=b80240374cee4930253d07e96a2f3d72c9a3e305;hb=904d744df98f63a70ec8832764bdfba1adda073a;hpb=9ce456700bab1a39ee3aa7f95bd7a2f9505d91ec;ds=sidebyside

diff --git a/Makefile b/Makefile
index b802403..236fd3c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,14 +7,22 @@ DEBUGF=-O0 -g
 LINKGN=bin/obj/hostnamed-gen.o bin/obj/localed-gen.o bin/obj/timedated-gen.o bin/obj/logind-gen.o
 LINKHN=bin/systemd-hostnamed bin/systemd-localed bin/systemd-timedated bin/systemd-logind
 
-GLIBEF=`pkg-config --cflags --libs glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0`
-GLIBOF=`pkg-config --cflags        glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0`
+GLIBEF=`pkg-config --cflags --libs glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0 polkit-agent-1`
+GLIBOF=`pkg-config --cflags        glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0 polkit-agent-1`
 
 SANITY=-Wno-unused-variable -Wno-unused-parameter # -Wno-comment
 
 PREFIX=/usr/local
+LIBDIR=$(PREFIX)/lib
+OUR_LIBDIR=$(LIBDIR)/systemd-compat
 SYSCONFDIR=/etc
+
 SRCDIR=src
+CONFDIR=conf
+POLICYDIR=$(CONFDIR)/sysbus-policy
+ISPECTDIR=$(CONFDIR)/introspect-xml
+SERVICEFDIR=$(CONFDIR)/service-files
+
 INTFDIR=$(SRCDIR)/interfaces
 
 DBUS_POLICYDIR=$(SYSCONFDIR)/dbus-1/system.d
@@ -67,10 +75,10 @@ _generate_genfiles:
 	$(INVOKE_GENFILE_SCRIPT) logind
 
 _install_conf:
-	cp conf/*-dbus.conf               $(DBUS_POLICYDIR)/
-	cp conf/org.freedesktop.*.service $(DBUS_CONFIGDIR)/
-	cp conf/systemd_compat.conf       $(SYSCONFDIR)/
+	cp $(POLICYDIR)/*-dbus.conf       $(DBUS_POLICYDIR)/
+	cp $(SERVICEFDIR)/*.service       $(DBUS_CONFIGDIR)/
+	cp $(CONFDIR)/systemd_compat.conf $(SYSCONFDIR)/
 
 _install_interface_binaries: $(LINKHN)
-	mkdir $(PREFIX)/bin/systemd-compat
-	cp bin/systemd-* $(PREFIX)/bin/systemd-compat/
+	mkdir -p $(OUR_LIBDIR)
+	cp bin/systemd-* $(OUR_LIBDIR)/