Merge branch 'devel' of git://uglyman.kremlin.cc/git/systembsd into devel

[systembsd.git] / Makefile

diff --git a/Makefile b/Makefile
index 93f52f248a5d51a5f63f37d66631a03d58c16e6f..3dede74d94b5b5950732874430b09a5fc8e3510b 100644 (file)
--- 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`
@@ -45,13 +44,13 @@ CONFDIR=    conf
 POLICYDIR=     $(CONFDIR)/sysbus-policy
 ISPECTDIR=     $(CONFDIR)/introspect-xml
 SERVICEFDIR=   $(CONFDIR)/service-files
-POLKITDIR=  $(CONFDIR)/polkit-policy
+POLKITDIR=     $(CONFDIR)/polkit-policy
 
 INTFDIR=       $(SRCDIR)/interfaces
 
-DBUS_POLICYDIR=        $(SYSCONFDIR)/dbus-1/system.d
-DBUS_CONFIGDIR=        $(PREFIX)/share/dbus-1/system-services
-POLKIT_POLICYDIR=   $(PREFIX)/share/polkit-1/actions
+DBUS_POLICYDIR=                $(SYSCONFDIR)/dbus-1/system.d
+DBUS_CONFIGDIR=                $(PREFIX)/share/dbus-1/system-services
+POLKIT_POLICYDIR=      $(PREFIX)/share/polkit-1/actions
 
 INVOKE_GENFILE_SCRIPT= \
                ./scripts/gen-gdbus-interfaces.sh 
@@ -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
@@ -95,10 +94,10 @@ _generate_servicefiles:
 _install_conf: _generate_servicefiles
        ${INSTALL_DATA_DIR} $(DESTDIR)$(DBUS_POLICYDIR)
        ${INSTALL_DATA_DIR} $(DESTDIR)$(DBUS_CONFIGDIR)
-       ${INSTALL_DATA_DIR} $(DESTDIR)$(SYSCONFDIR)
+       ${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} $(CONFDIR)/systemd_compat.conf $(DESTDIR)$(SYSCONFDIR)/
        ${INSTALL_DATA} $(POLKITDIR)/*.policy $(DESTDIR)$(POLKIT_POLICYDIR)/
 
 _install_interface_binaries: $(LINKHN)