From: Michal Nowikowski Date: Mon, 27 May 2019 21:00:04 +0000 (+0200) Subject: Revert "[#584,!338] Addressed review comments" X-Git-Tag: Kea-1.6.0-beta~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f301de25c5b27cfa740572eac64c55d4ac2f610b;p=thirdparty%2Fkea.git Revert "[#584,!338] Addressed review comments" This reverts commit 64060356bee9b7444731115bb989da13771c71fd. --- diff --git a/doc/Makefile.am b/doc/Makefile.am index f076ba65c5..cd8858756a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -69,11 +69,9 @@ nobase_dist_doc_DATA += examples/kea6/stateless.json nobase_dist_doc_DATA += examples/kea6/with-ddns.json if HAVE_SYSREPO -# BAD configs are for testing only. Do not install them. -#nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-config.xml -#nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-schema.xml -#nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-translator.xml - +nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-config.xml +nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-schema.xml +nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-translator.xml nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/boot.json nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/logging.xml nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/netconf.json diff --git a/src/bin/keactrl/Makefile.am b/src/bin/keactrl/Makefile.am index af32b3d81b..55b597c2fc 100644 --- a/src/bin/keactrl/Makefile.am +++ b/src/bin/keactrl/Makefile.am @@ -19,7 +19,7 @@ DISTCLEANFILES = keactrl keactrl.conf $(man_MANS) CLEANFILES = $(KEA_CONFIGFILES) EXTRA_DIST = keactrl.in keactrl.conf.in kea-dhcp4.conf.pre \ kea-dhcp6.conf.pre kea-dhcp-ddns.conf.pre \ - kea-ctrl-agent.conf.pre \ + kea-ctrl-agent.conf.pre kea-netconf.conf.pre \ $(man_MANS) keactrl.xml if HAVE_SYSREPO