set /etc/myname when setStaticHostname is called

[systembsd.git] / Makefile

diff --git a/Makefile b/Makefile
index 7639490d2a0ebeb52c6671626ffe95aa3d592ac6..2157aa769330ee2c9e8216eb764452e7d70ec123 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
@@ -95,11 +95,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)