1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ondrej@debian.org>
Date: Sun, 6 Nov 2016 16:03:07 +0100
Subject: Get the correct systemd services path from pkg-config
--variable=systemdsystemunitdir systemd
---
Makefile.in | 10 +++++-----
configure.ac | 14 ++++++++++++++
2 files changed, 19 insertions(+), 5 deletions(-)
--- a/Makefile.in
+++ b/Makefile.in
@@ -403,12 +403,12 @@
networkmanager-hook-install:
$(INSTALL) -m 755 -d $(DESTDIR)$(networkmanager_dispatcher_dir)
$(INSTALL) -m 755 -d $(DESTDIR)/etc
- $(INSTALL) -m 755 -d $(DESTDIR)/usr/lib/systemd/system
+ $(INSTALL) -m 755 -d $(DESTDIR)$(systemdsystemunitdir)
$(INSTALL) -c -m 755 01-dnssec-trigger $(DESTDIR)$(networkmanager_dispatcher_dir)/01-dnssec-trigger
$(INSTALL) -c -m 755 dnssec-trigger-script $(DESTDIR)$(libexecdir)/dnssec-trigger-script
$(INSTALL) -c -m 644 dnssec.conf $(DESTDIR)/etc/dnssec.conf
- $(INSTALL) -c -m 644 dnssec-triggerd.service $(DESTDIR)/usr/lib/systemd/system/dnssec-triggerd.service
- $(INSTALL) -c -m 644 dnssec-triggerd-keygen.service $(DESTDIR)/usr/lib/systemd/system/dnssec-triggerd-keygen.service
+ $(INSTALL) -c -m 644 dnssec-triggerd.service $(DESTDIR)$(systemdsystemunitdir)/dnssec-triggerd.service
+ $(INSTALL) -c -m 644 dnssec-triggerd-keygen.service $(DESTDIR)$(systemdsystemunitdir)/dnssec-triggerd-keygen.service
networkmanager-hook-uninstall:
@echo "attempt to restore resolv.conf mutability"
@@ -416,8 +416,8 @@
rm -f $(DESTDIR)$(networkmanager_dispatcher_dir)/01-dnssec-trigger
rm -f $(DESTDIR)$(libexecdir)/dnssec-trigger-script
rm -f $(DESTDIR)/etc/dnssec.conf
- rm -f $(DESTDIR)/usr/lib/systemd/system/dnssec-triggerd.service
- rm -f $(DESTDIR)/usr/lib/systemd/system/dnssec-triggerd-keygen.service
+ rm -f $(DESTDIR)$(systemdsystemunitdir)/dnssec-triggerd.service
+ rm -f $(DESTDIR)$(systemdsystemunitdir)/dnssec-triggerd-keygen.service
osx-hook-install:
$(INSTALL) -m 755 -d $(DESTDIR)$(osx_launchdaemons_dir)
--- a/configure.ac
+++ b/configure.ac
@@ -236,6 +236,20 @@
AC_REPLACE_FUNCS(strlcpy)
AC_REPLACE_FUNCS(memmove)
+# systemd settings
+if pkg-config --exists systemd; then
+ systemdsystemunitdir="`pkg-config --variable=systemdsystemunitdir systemd`"
+else
+ systemdsystemunitdir="$libdir/systemd/system"
+fi
+AC_ARG_WITH([unitdir], AC_HELP_STRING([--with-unitdir=dir],
+ [Set the systemd system unit dir, defaults to systemd default if systemd is installed or LIBDIR/systemd/system]),
+ , withval="")
+if test -n "$withval"; then
+ systemdsystemunitdir="$withval"
+fi
+AC_SUBST([systemdsystemunitdir])
+
hooks="auto"
AC_ARG_WITH([hooks], AC_HELP_STRING([--with-hooks],
[Set the DHCP change hooks to use, default 'auto', can be 'osx', 'networkmanager', 'netconfig', 'windows' or 'none']),, withval="")
|
