summaryrefslogtreecommitdiff
path: root/Makefile-man.am
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-05-18 22:10:48 +0200
committerTom Gundersen <teg@jklm.no>2014-05-19 18:14:56 +0200
commit091a364c802e34a58f3260c9cb5db9b75c62215c (patch)
tree35b22463dde65c3fcaec38653fe757ae30152b15 /Makefile-man.am
parent7dbf94a9c4dcdf9b56384e66eb2652fb61da5063 (diff)
resolved: add daemon to manage resolv.conf
Also remove the equivalent functionality from networkd.
Diffstat (limited to 'Makefile-man.am')
-rw-r--r--Makefile-man.am14
1 files changed, 14 insertions, 0 deletions
diff --git a/Makefile-man.am b/Makefile-man.am
index ca7d209bdf..6d57b75132 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1131,6 +1131,18 @@ man/systemd-readahead.html: man/systemd-readahead-replay.service.html
endif
+if ENABLE_RESOLVED
+MANPAGES += \
+ man/resolved.conf.5 \
+ man/systemd-resolved.service.8
+MANPAGES_ALIAS += \
+ man/systemd-resolved.8
+man/systemd-resolved.8: man/systemd-resolved.service.8
+man/systemd-resolved.html: man/systemd-resolved.service.html
+ $(html-alias)
+
+endif
+
if ENABLE_RFKILL
MANPAGES += \
man/systemd-rfkill@.service.8
@@ -1483,6 +1495,7 @@ EXTRA_DIST += \
man/nss-myhostname.xml \
man/os-release.xml \
man/pam_systemd.xml \
+ man/resolved.conf.xml \
man/runlevel.xml \
man/sd-daemon.xml \
man/sd-id128.xml \
@@ -1581,6 +1594,7 @@ EXTRA_DIST += \
man/systemd-random-seed.service.xml \
man/systemd-readahead-replay.service.xml \
man/systemd-remount-fs.service.xml \
+ man/systemd-resolved.service.xml \
man/systemd-rfkill@.service.xml \
man/systemd-run.xml \
man/systemd-shutdownd.service.xml \