X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=Makefile;h=3dede74d94b5b5950732874430b09a5fc8e3510b;hp=bcfab914bda24e6ba1b0688b74b215cdd8fc8535;hb=10ddceeb98322259fc13e3022ceeafc2191bb89d;hpb=3d6bffb8877bb40df1095c6966985c3ccd543548

diff --git a/Makefile b/Makefile
index bcfab91..3dede74 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ CFLAGS+=	-Wno-unused-variable -Wno-unused-parameter # -Wno-comment
 .endif
 
 PREFIX?=	/usr/local
-BINDIR=		$(PREFIX)/libexec
+BINDIR=		$(PREFIX)/libexec/systemd
 SYSCONFDIR?=	/etc
 
 INSTALL_PROGRAM=	install -c -s -o root -g bin -m 555
@@ -34,7 +34,6 @@ LINKHN=		bin/systemd-hostnamed \
 
 DBUS_SERVICES=	org.freedesktop.hostname1.service \
 		org.freedesktop.locale1.service \
-		org.freedesktop.login1.service \
 		org.freedesktop.timedate1.service
 
 GLIBEF=`pkg-config --cflags --libs glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0 polkit-agent-1`
@@ -79,7 +78,7 @@ _build_genfile_objs: _generate_genfiles _build_auth_obj
 	$(CC) -o bin/obj/logind-gen.o    $(CFLAGS) $(GLIBOF) -c $(INTFDIR)/logind/logind-gen.c
 
 _build_auth_obj:
-	$(CC) -o bin/obj/polkit-auth.o $(CFLAGS) $(GLIBOF) -c $(SRCDIR)/polkit-auth.c
+	$(CC) -o bin/obj/polkit-auth.o $(CFLAGS) $(GLIBOF) -c $(SRCDIR)/util.c
 
 _generate_genfiles:
 	$(INVOKE_GENFILE_SCRIPT) hostnamed
@@ -96,6 +95,7 @@ _install_conf: _generate_servicefiles
 	${INSTALL_DATA_DIR} $(DESTDIR)$(DBUS_POLICYDIR)
 	${INSTALL_DATA_DIR} $(DESTDIR)$(DBUS_CONFIGDIR)
 	${INSTALL_DATA_DIR} $(DESTDIR)$(POLKIT_POLICYDIR)
+	${INSTALL_DATA} $(CONFDIR)/machine-info $(DESTDIR)$(SYSCONFDIR)/
 	${INSTALL_DATA} $(POLICYDIR)/*-dbus.conf $(DESTDIR)$(DBUS_POLICYDIR)/
 	${INSTALL_DATA} $(SERVICEFDIR)/*.service $(DESTDIR)$(DBUS_CONFIGDIR)/
 	${INSTALL_DATA} $(POLKITDIR)/*.policy $(DESTDIR)$(POLKIT_POLICYDIR)/