X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=88d0ce3d474c5d298659ae6c52d36179c8e81af6;hb=a2fef7701ba2e0179ec2217fd562b7345b15735c;hp=85d51b4a96e8da21db0b209f0559424fd323ddfd;hpb=099524d7b0df690e3361ffc3fe3c6aed0558b4fc;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 85d51b4a9..88d0ce3d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 += \
@@ -1020,6 +1019,7 @@ libsystemd_core_la_CFLAGS = \
 	$(AUDIT_CFLAGS) \
 	$(CAP_CFLAGS) \
 	$(KMOD_CFLAGS) \
+	$(APPARMOR_CFLAGS) \
 	$(SECCOMP_CFLAGS) \
 	-pthread
 
@@ -1035,6 +1035,7 @@ libsystemd_core_la_LIBADD = \
 	$(AUDIT_LIBS) \
 	$(CAP_LIBS) \
 	$(KMOD_LIBS) \
+	$(APPARMOR_LIBS) \
 	$(SECCOMP_LIBS)
 
 if HAVE_SECCOMP
@@ -1882,9 +1883,13 @@ systemd_nspawn_LDADD = \
 	libsystemd-capability.la \
 	libsystemd-internal.la \
 	libudev-internal.la \
-	libsystemd-shared.la \
+	libsystemd-shared.la
+
+if HAVE_SECCOMP
+systemd_nspawn_LDADD += \
 	libsystemd-seccomp.la \
 	$(SECCOMP_LIBS)
+endif
 
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
@@ -3950,8 +3955,8 @@ systemd_networkd_LDADD = \
 nodist_systemunit_DATA += \
 	units/systemd-networkd.service
 
-MULTI_USER_TARGET_WANTS += \
-	systemd-networkd.service
+GENERAL_ALIASES += \
+	$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service
 
 test_network_SOURCES = \
 	src/network/test-network.c \