chiark / gitweb /
update TODO
[elogind.git] / Makefile.am
index 6f8d3b5a29be4d05416ac811367d32c046e618c1..1fc23f72f80dd11c7a20612dc10ba68197a6cc15 100644 (file)
@@ -87,7 +87,7 @@ userunitdir=$(prefix)/lib/systemd/user
 userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
-networkdir=$(prefix)/lib/systemd/network
+networkdir=$(rootprefix)/lib/systemd/network
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 usergeneratordir=$(prefix)/lib/systemd/user-generators
@@ -646,8 +646,7 @@ EXTRA_DIST += \
        tools/make-man-index.py \
        tools/make-directive-index.py \
        tools/make-man-rules.py \
-       tools/xml_helper.py \
-       man/less-variables.xml
+       tools/xml_helper.py
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -3956,9 +3955,6 @@ systemd_networkd_LDADD = \
 nodist_systemunit_DATA += \
        units/systemd-networkd.service
 
-MULTI_USER_TARGET_WANTS += \
-       systemd-networkd.service
-
 test_network_SOURCES = \
        src/network/test-network.c \
        src/network/networkd.h \
@@ -4749,6 +4745,7 @@ USER_UNIT_ALIASES += \
 
 GENERAL_ALIASES += \
        $(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
+       $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
        $(systemunitdir)/getty@.service $(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \
        $(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \
        ../system-services/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service