X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=0b879f1bc11ab42255cb1785fa54fce8e1005e25;hp=6f8d3b5a29be4d05416ac811367d32c046e618c1;hb=f0329635f80c9d56fca0f6ff6ad0179fbe7e50a4;hpb=eef65bf3ee6f73afa4a5de23ae3a794a279f30c0 diff --git a/Makefile.am b/Makefile.am index 6f8d3b5a2..0b879f1bc 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 += \ @@ -2017,6 +2016,9 @@ libsystemd_internal_la_CFLAGS = \ $(AM_CFLAGS) \ -pthread +libsystemd_internal_la_LIBADD = \ + $(RT_LIBS) + noinst_LTLIBRARIES += \ libsystemd-internal.la @@ -3956,8 +3958,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 \