From: Samuli Suominen Date: Fri, 21 Feb 2014 14:14:51 +0000 (+0200) Subject: build-sys: make network files respect --rootprefix X-Git-Tag: v210~77 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=74fae4240f670fe5a39a82a71abad367d18caefa build-sys: make network files respect --rootprefix With --rootprefix= systemd-udevd gets installed to /lib/systemd, and since the network configuration is also required during early boot, it should be available there with it. Using --prefix= is not an option since it would put everything, including pkg-config files, man pages, documentation, to / which is not wanted. This commit puts 99-default.link to /lib/systemd/network/ when required. --- diff --git a/Makefile.am b/Makefile.am index f6c22bd28..1fc23f72f 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