[#1248] fixed Makefiles for sphinx on Centos 7

diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index 7f3b67bf8b91ee4070c2536c0c1d9509403f33c4..2ebe069e8166f45ce9c4b7e869585263055752fd 100644 (file)
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -76,7 +76,7 @@ $(srcdir)/kea-messages.rst: $(mes_files) mes2doc.py
 
 # build the list of api files
 api-files.txt: api/api_files.mk
-       @sed 's;_files .*%/;/;' $< > $@
+       @sed 's;_files .*/api/;/;' $< > $@
 
 # some tools do not use this makefile but still need generate files.
 EXTRA_DIST += mes-files.txt api-files.txt

diff --git a/doc/sphinx/api/api_files.mk b/doc/sphinx/api/api_files.mk
index 3d086ed13755e4b1cc814f606915d99f02ed4cf1..bc9e46025dc3d9ba008a6225287839b9a716a28d 100644 (file)
--- a/doc/sphinx/api/api_files.mk
+++ b/doc/sphinx/api/api_files.mk
@@ -1,164 +1,164 @@
-api_files += $(srcdir)/%reldir%/build-report.json
-api_files += $(srcdir)/%reldir%/cache-clear.json
-api_files += $(srcdir)/%reldir%/cache-get-by-id.json
-api_files += $(srcdir)/%reldir%/cache-get.json
-api_files += $(srcdir)/%reldir%/cache-insert.json
-api_files += $(srcdir)/%reldir%/cache-load.json
-api_files += $(srcdir)/%reldir%/cache-remove.json
-api_files += $(srcdir)/%reldir%/cache-size.json
-api_files += $(srcdir)/%reldir%/cache-write.json
-api_files += $(srcdir)/%reldir%/class-add.json
-api_files += $(srcdir)/%reldir%/class-del.json
-api_files += $(srcdir)/%reldir%/class-get.json
-api_files += $(srcdir)/%reldir%/class-list.json
-api_files += $(srcdir)/%reldir%/class-update.json
-api_files += $(srcdir)/%reldir%/config-backend-pull.json
-api_files += $(srcdir)/%reldir%/config-get.json
-api_files += $(srcdir)/%reldir%/config-reload.json
-api_files += $(srcdir)/%reldir%/config-set.json
-api_files += $(srcdir)/%reldir%/config-test.json
-api_files += $(srcdir)/%reldir%/config-write.json
-api_files += $(srcdir)/%reldir%/dhcp-disable.json
-api_files += $(srcdir)/%reldir%/dhcp-enable.json
-api_files += $(srcdir)/%reldir%/ha-continue.json
-api_files += $(srcdir)/%reldir%/ha-heartbeat.json
-api_files += $(srcdir)/%reldir%/ha-maintenance-cancel.json
-api_files += $(srcdir)/%reldir%/ha-maintenance-notify.json
-api_files += $(srcdir)/%reldir%/ha-maintenance-start.json
-api_files += $(srcdir)/%reldir%/ha-scopes.json
-api_files += $(srcdir)/%reldir%/ha-sync.json
-api_files += $(srcdir)/%reldir%/lease4-add.json
-api_files += $(srcdir)/%reldir%/lease4-del.json
-api_files += $(srcdir)/%reldir%/lease4-get-all.json
-api_files += $(srcdir)/%reldir%/lease4-get-by-client-id.json
-api_files += $(srcdir)/%reldir%/lease4-get-by-hostname.json
-api_files += $(srcdir)/%reldir%/lease4-get-by-hw-address.json
-api_files += $(srcdir)/%reldir%/lease4-get-page.json
-api_files += $(srcdir)/%reldir%/lease4-get.json
-api_files += $(srcdir)/%reldir%/lease4-resend-ddns.json
-api_files += $(srcdir)/%reldir%/lease4-update.json
-api_files += $(srcdir)/%reldir%/lease4-wipe.json
-api_files += $(srcdir)/%reldir%/lease6-add.json
-api_files += $(srcdir)/%reldir%/lease6-bulk-apply.json
-api_files += $(srcdir)/%reldir%/lease6-del.json
-api_files += $(srcdir)/%reldir%/lease6-get-all.json
-api_files += $(srcdir)/%reldir%/lease6-get-by-duid.json
-api_files += $(srcdir)/%reldir%/lease6-get-by-hostname.json
-api_files += $(srcdir)/%reldir%/lease6-get-page.json
-api_files += $(srcdir)/%reldir%/lease6-get.json
-api_files += $(srcdir)/%reldir%/lease6-resend-ddns.json
-api_files += $(srcdir)/%reldir%/lease6-update.json
-api_files += $(srcdir)/%reldir%/lease6-wipe.json
-api_files += $(srcdir)/%reldir%/leases-reclaim.json
-api_files += $(srcdir)/%reldir%/libreload.json
-api_files += $(srcdir)/%reldir%/list-commands.json
-api_files += $(srcdir)/%reldir%/network4-add.json
-api_files += $(srcdir)/%reldir%/network4-del.json
-api_files += $(srcdir)/%reldir%/network4-get.json
-api_files += $(srcdir)/%reldir%/network4-list.json
-api_files += $(srcdir)/%reldir%/network4-subnet-add.json
-api_files += $(srcdir)/%reldir%/network4-subnet-del.json
-api_files += $(srcdir)/%reldir%/network6-add.json
-api_files += $(srcdir)/%reldir%/network6-del.json
-api_files += $(srcdir)/%reldir%/network6-get.json
-api_files += $(srcdir)/%reldir%/network6-list.json
-api_files += $(srcdir)/%reldir%/network6-subnet-add.json
-api_files += $(srcdir)/%reldir%/network6-subnet-del.json
-api_files += $(srcdir)/%reldir%/remote-global-parameter4-del.json
-api_files += $(srcdir)/%reldir%/remote-global-parameter4-get-all.json
-api_files += $(srcdir)/%reldir%/remote-global-parameter4-get.json
-api_files += $(srcdir)/%reldir%/remote-global-parameter4-set.json
-api_files += $(srcdir)/%reldir%/remote-global-parameter6-del.json
-api_files += $(srcdir)/%reldir%/remote-global-parameter6-get-all.json
-api_files += $(srcdir)/%reldir%/remote-global-parameter6-get.json
-api_files += $(srcdir)/%reldir%/remote-global-parameter6-set.json
-api_files += $(srcdir)/%reldir%/remote-network4-del.json
-api_files += $(srcdir)/%reldir%/remote-network4-get.json
-api_files += $(srcdir)/%reldir%/remote-network4-list.json
-api_files += $(srcdir)/%reldir%/remote-network4-set.json
-api_files += $(srcdir)/%reldir%/remote-network6-del.json
-api_files += $(srcdir)/%reldir%/remote-network6-get.json
-api_files += $(srcdir)/%reldir%/remote-network6-list.json
-api_files += $(srcdir)/%reldir%/remote-network6-set.json
-api_files += $(srcdir)/%reldir%/remote-option-def4-del.json
-api_files += $(srcdir)/%reldir%/remote-option-def4-get-all.json
-api_files += $(srcdir)/%reldir%/remote-option-def4-get.json
-api_files += $(srcdir)/%reldir%/remote-option-def4-set.json
-api_files += $(srcdir)/%reldir%/remote-option-def6-del.json
-api_files += $(srcdir)/%reldir%/remote-option-def6-get-all.json
-api_files += $(srcdir)/%reldir%/remote-option-def6-get.json
-api_files += $(srcdir)/%reldir%/remote-option-def6-set.json
-api_files += $(srcdir)/%reldir%/remote-option4-global-del.json
-api_files += $(srcdir)/%reldir%/remote-option4-global-get-all.json
-api_files += $(srcdir)/%reldir%/remote-option4-global-get.json
-api_files += $(srcdir)/%reldir%/remote-option4-global-set.json
-api_files += $(srcdir)/%reldir%/remote-option4-network-del.json
-api_files += $(srcdir)/%reldir%/remote-option4-network-set.json
-api_files += $(srcdir)/%reldir%/remote-option4-pool-del.json
-api_files += $(srcdir)/%reldir%/remote-option4-pool-set.json
-api_files += $(srcdir)/%reldir%/remote-option4-subnet-del.json
-api_files += $(srcdir)/%reldir%/remote-option4-subnet-set.json
-api_files += $(srcdir)/%reldir%/remote-option6-global-del.json
-api_files += $(srcdir)/%reldir%/remote-option6-global-get-all.json
-api_files += $(srcdir)/%reldir%/remote-option6-global-get.json
-api_files += $(srcdir)/%reldir%/remote-option6-global-set.json
-api_files += $(srcdir)/%reldir%/remote-option6-network-del.json
-api_files += $(srcdir)/%reldir%/remote-option6-network-set.json
-api_files += $(srcdir)/%reldir%/remote-option6-pd-pool-del.json
-api_files += $(srcdir)/%reldir%/remote-option6-pd-pool-set.json
-api_files += $(srcdir)/%reldir%/remote-option6-pool-del.json
-api_files += $(srcdir)/%reldir%/remote-option6-pool-set.json
-api_files += $(srcdir)/%reldir%/remote-option6-subnet-del.json
-api_files += $(srcdir)/%reldir%/remote-option6-subnet-set.json
-api_files += $(srcdir)/%reldir%/remote-server4-del.json
-api_files += $(srcdir)/%reldir%/remote-server4-get-all.json
-api_files += $(srcdir)/%reldir%/remote-server4-get.json
-api_files += $(srcdir)/%reldir%/remote-server4-set.json
-api_files += $(srcdir)/%reldir%/remote-server6-del.json
-api_files += $(srcdir)/%reldir%/remote-server6-get-all.json
-api_files += $(srcdir)/%reldir%/remote-server6-get.json
-api_files += $(srcdir)/%reldir%/remote-server6-set.json
-api_files += $(srcdir)/%reldir%/remote-subnet4-del-by-id.json
-api_files += $(srcdir)/%reldir%/remote-subnet4-del-by-prefix.json
-api_files += $(srcdir)/%reldir%/remote-subnet4-get-by-id.json
-api_files += $(srcdir)/%reldir%/remote-subnet4-get-by-prefix.json
-api_files += $(srcdir)/%reldir%/remote-subnet4-list.json
-api_files += $(srcdir)/%reldir%/remote-subnet4-set.json
-api_files += $(srcdir)/%reldir%/remote-subnet6-del-by-id.json
-api_files += $(srcdir)/%reldir%/remote-subnet6-del-by-prefix.json
-api_files += $(srcdir)/%reldir%/remote-subnet6-get-by-id.json
-api_files += $(srcdir)/%reldir%/remote-subnet6-get-by-prefix.json
-api_files += $(srcdir)/%reldir%/remote-subnet6-list.json
-api_files += $(srcdir)/%reldir%/remote-subnet6-set.json
-api_files += $(srcdir)/%reldir%/reservation-add.json
-api_files += $(srcdir)/%reldir%/reservation-del.json
-api_files += $(srcdir)/%reldir%/reservation-get-all.json
-api_files += $(srcdir)/%reldir%/reservation-get-by-hostname.json
-api_files += $(srcdir)/%reldir%/reservation-get-page.json
-api_files += $(srcdir)/%reldir%/reservation-get.json
-api_files += $(srcdir)/%reldir%/server-tag-get.json
-api_files += $(srcdir)/%reldir%/shutdown.json
-api_files += $(srcdir)/%reldir%/stat-lease4-get.json
-api_files += $(srcdir)/%reldir%/stat-lease6-get.json
-api_files += $(srcdir)/%reldir%/statistic-get-all.json
-api_files += $(srcdir)/%reldir%/statistic-get.json
-api_files += $(srcdir)/%reldir%/statistic-remove-all.json
-api_files += $(srcdir)/%reldir%/statistic-remove.json
-api_files += $(srcdir)/%reldir%/statistic-reset-all.json
-api_files += $(srcdir)/%reldir%/statistic-reset.json
-api_files += $(srcdir)/%reldir%/statistic-sample-age-set-all.json
-api_files += $(srcdir)/%reldir%/statistic-sample-age-set.json
-api_files += $(srcdir)/%reldir%/statistic-sample-count-set-all.json
-api_files += $(srcdir)/%reldir%/statistic-sample-count-set.json
-api_files += $(srcdir)/%reldir%/status-get.json
-api_files += $(srcdir)/%reldir%/subnet4-add.json
-api_files += $(srcdir)/%reldir%/subnet4-del.json
-api_files += $(srcdir)/%reldir%/subnet4-get.json
-api_files += $(srcdir)/%reldir%/subnet4-list.json
-api_files += $(srcdir)/%reldir%/subnet4-update.json
-api_files += $(srcdir)/%reldir%/subnet6-add.json
-api_files += $(srcdir)/%reldir%/subnet6-del.json
-api_files += $(srcdir)/%reldir%/subnet6-get.json
-api_files += $(srcdir)/%reldir%/subnet6-list.json
-api_files += $(srcdir)/%reldir%/subnet6-update.json
-api_files += $(srcdir)/%reldir%/version-get.json
+api_files += $(srcdir)/api/build-report.json
+api_files += $(srcdir)/api/cache-clear.json
+api_files += $(srcdir)/api/cache-get-by-id.json
+api_files += $(srcdir)/api/cache-get.json
+api_files += $(srcdir)/api/cache-insert.json
+api_files += $(srcdir)/api/cache-load.json
+api_files += $(srcdir)/api/cache-remove.json
+api_files += $(srcdir)/api/cache-size.json
+api_files += $(srcdir)/api/cache-write.json
+api_files += $(srcdir)/api/class-add.json
+api_files += $(srcdir)/api/class-del.json
+api_files += $(srcdir)/api/class-get.json
+api_files += $(srcdir)/api/class-list.json
+api_files += $(srcdir)/api/class-update.json
+api_files += $(srcdir)/api/config-backend-pull.json
+api_files += $(srcdir)/api/config-get.json
+api_files += $(srcdir)/api/config-reload.json
+api_files += $(srcdir)/api/config-set.json
+api_files += $(srcdir)/api/config-test.json
+api_files += $(srcdir)/api/config-write.json
+api_files += $(srcdir)/api/dhcp-disable.json
+api_files += $(srcdir)/api/dhcp-enable.json
+api_files += $(srcdir)/api/ha-continue.json
+api_files += $(srcdir)/api/ha-heartbeat.json
+api_files += $(srcdir)/api/ha-maintenance-cancel.json
+api_files += $(srcdir)/api/ha-maintenance-notify.json
+api_files += $(srcdir)/api/ha-maintenance-start.json
+api_files += $(srcdir)/api/ha-scopes.json
+api_files += $(srcdir)/api/ha-sync.json
+api_files += $(srcdir)/api/lease4-add.json
+api_files += $(srcdir)/api/lease4-del.json
+api_files += $(srcdir)/api/lease4-get-all.json
+api_files += $(srcdir)/api/lease4-get-by-client-id.json
+api_files += $(srcdir)/api/lease4-get-by-hostname.json
+api_files += $(srcdir)/api/lease4-get-by-hw-address.json
+api_files += $(srcdir)/api/lease4-get-page.json
+api_files += $(srcdir)/api/lease4-get.json
+api_files += $(srcdir)/api/lease4-resend-ddns.json
+api_files += $(srcdir)/api/lease4-update.json
+api_files += $(srcdir)/api/lease4-wipe.json
+api_files += $(srcdir)/api/lease6-add.json
+api_files += $(srcdir)/api/lease6-bulk-apply.json
+api_files += $(srcdir)/api/lease6-del.json
+api_files += $(srcdir)/api/lease6-get-all.json
+api_files += $(srcdir)/api/lease6-get-by-duid.json
+api_files += $(srcdir)/api/lease6-get-by-hostname.json
+api_files += $(srcdir)/api/lease6-get-page.json
+api_files += $(srcdir)/api/lease6-get.json
+api_files += $(srcdir)/api/lease6-resend-ddns.json
+api_files += $(srcdir)/api/lease6-update.json
+api_files += $(srcdir)/api/lease6-wipe.json
+api_files += $(srcdir)/api/leases-reclaim.json
+api_files += $(srcdir)/api/libreload.json
+api_files += $(srcdir)/api/list-commands.json
+api_files += $(srcdir)/api/network4-add.json
+api_files += $(srcdir)/api/network4-del.json
+api_files += $(srcdir)/api/network4-get.json
+api_files += $(srcdir)/api/network4-list.json
+api_files += $(srcdir)/api/network4-subnet-add.json
+api_files += $(srcdir)/api/network4-subnet-del.json
+api_files += $(srcdir)/api/network6-add.json
+api_files += $(srcdir)/api/network6-del.json
+api_files += $(srcdir)/api/network6-get.json
+api_files += $(srcdir)/api/network6-list.json
+api_files += $(srcdir)/api/network6-subnet-add.json
+api_files += $(srcdir)/api/network6-subnet-del.json
+api_files += $(srcdir)/api/remote-global-parameter4-del.json
+api_files += $(srcdir)/api/remote-global-parameter4-get-all.json
+api_files += $(srcdir)/api/remote-global-parameter4-get.json
+api_files += $(srcdir)/api/remote-global-parameter4-set.json
+api_files += $(srcdir)/api/remote-global-parameter6-del.json
+api_files += $(srcdir)/api/remote-global-parameter6-get-all.json
+api_files += $(srcdir)/api/remote-global-parameter6-get.json
+api_files += $(srcdir)/api/remote-global-parameter6-set.json
+api_files += $(srcdir)/api/remote-network4-del.json
+api_files += $(srcdir)/api/remote-network4-get.json
+api_files += $(srcdir)/api/remote-network4-list.json
+api_files += $(srcdir)/api/remote-network4-set.json
+api_files += $(srcdir)/api/remote-network6-del.json
+api_files += $(srcdir)/api/remote-network6-get.json
+api_files += $(srcdir)/api/remote-network6-list.json
+api_files += $(srcdir)/api/remote-network6-set.json
+api_files += $(srcdir)/api/remote-option-def4-del.json
+api_files += $(srcdir)/api/remote-option-def4-get-all.json
+api_files += $(srcdir)/api/remote-option-def4-get.json
+api_files += $(srcdir)/api/remote-option-def4-set.json
+api_files += $(srcdir)/api/remote-option-def6-del.json
+api_files += $(srcdir)/api/remote-option-def6-get-all.json
+api_files += $(srcdir)/api/remote-option-def6-get.json
+api_files += $(srcdir)/api/remote-option-def6-set.json
+api_files += $(srcdir)/api/remote-option4-global-del.json
+api_files += $(srcdir)/api/remote-option4-global-get-all.json
+api_files += $(srcdir)/api/remote-option4-global-get.json
+api_files += $(srcdir)/api/remote-option4-global-set.json
+api_files += $(srcdir)/api/remote-option4-network-del.json
+api_files += $(srcdir)/api/remote-option4-network-set.json
+api_files += $(srcdir)/api/remote-option4-pool-del.json
+api_files += $(srcdir)/api/remote-option4-pool-set.json
+api_files += $(srcdir)/api/remote-option4-subnet-del.json
+api_files += $(srcdir)/api/remote-option4-subnet-set.json
+api_files += $(srcdir)/api/remote-option6-global-del.json
+api_files += $(srcdir)/api/remote-option6-global-get-all.json
+api_files += $(srcdir)/api/remote-option6-global-get.json
+api_files += $(srcdir)/api/remote-option6-global-set.json
+api_files += $(srcdir)/api/remote-option6-network-del.json
+api_files += $(srcdir)/api/remote-option6-network-set.json
+api_files += $(srcdir)/api/remote-option6-pd-pool-del.json
+api_files += $(srcdir)/api/remote-option6-pd-pool-set.json
+api_files += $(srcdir)/api/remote-option6-pool-del.json
+api_files += $(srcdir)/api/remote-option6-pool-set.json
+api_files += $(srcdir)/api/remote-option6-subnet-del.json
+api_files += $(srcdir)/api/remote-option6-subnet-set.json
+api_files += $(srcdir)/api/remote-server4-del.json
+api_files += $(srcdir)/api/remote-server4-get-all.json
+api_files += $(srcdir)/api/remote-server4-get.json
+api_files += $(srcdir)/api/remote-server4-set.json
+api_files += $(srcdir)/api/remote-server6-del.json
+api_files += $(srcdir)/api/remote-server6-get-all.json
+api_files += $(srcdir)/api/remote-server6-get.json
+api_files += $(srcdir)/api/remote-server6-set.json
+api_files += $(srcdir)/api/remote-subnet4-del-by-id.json
+api_files += $(srcdir)/api/remote-subnet4-del-by-prefix.json
+api_files += $(srcdir)/api/remote-subnet4-get-by-id.json
+api_files += $(srcdir)/api/remote-subnet4-get-by-prefix.json
+api_files += $(srcdir)/api/remote-subnet4-list.json
+api_files += $(srcdir)/api/remote-subnet4-set.json
+api_files += $(srcdir)/api/remote-subnet6-del-by-id.json
+api_files += $(srcdir)/api/remote-subnet6-del-by-prefix.json
+api_files += $(srcdir)/api/remote-subnet6-get-by-id.json
+api_files += $(srcdir)/api/remote-subnet6-get-by-prefix.json
+api_files += $(srcdir)/api/remote-subnet6-list.json
+api_files += $(srcdir)/api/remote-subnet6-set.json
+api_files += $(srcdir)/api/reservation-add.json
+api_files += $(srcdir)/api/reservation-del.json
+api_files += $(srcdir)/api/reservation-get-all.json
+api_files += $(srcdir)/api/reservation-get-by-hostname.json
+api_files += $(srcdir)/api/reservation-get-page.json
+api_files += $(srcdir)/api/reservation-get.json
+api_files += $(srcdir)/api/server-tag-get.json
+api_files += $(srcdir)/api/shutdown.json
+api_files += $(srcdir)/api/stat-lease4-get.json
+api_files += $(srcdir)/api/stat-lease6-get.json
+api_files += $(srcdir)/api/statistic-get-all.json
+api_files += $(srcdir)/api/statistic-get.json
+api_files += $(srcdir)/api/statistic-remove-all.json
+api_files += $(srcdir)/api/statistic-remove.json
+api_files += $(srcdir)/api/statistic-reset-all.json
+api_files += $(srcdir)/api/statistic-reset.json
+api_files += $(srcdir)/api/statistic-sample-age-set-all.json
+api_files += $(srcdir)/api/statistic-sample-age-set.json
+api_files += $(srcdir)/api/statistic-sample-count-set-all.json
+api_files += $(srcdir)/api/statistic-sample-count-set.json
+api_files += $(srcdir)/api/status-get.json
+api_files += $(srcdir)/api/subnet4-add.json
+api_files += $(srcdir)/api/subnet4-del.json
+api_files += $(srcdir)/api/subnet4-get.json
+api_files += $(srcdir)/api/subnet4-list.json
+api_files += $(srcdir)/api/subnet4-update.json
+api_files += $(srcdir)/api/subnet6-add.json
+api_files += $(srcdir)/api/subnet6-del.json
+api_files += $(srcdir)/api/subnet6-get.json
+api_files += $(srcdir)/api/subnet6-list.json
+api_files += $(srcdir)/api/subnet6-update.json
+api_files += $(srcdir)/api/version-get.json

diff --git a/doc/sphinx/arm/rst_arm_sources.mk b/doc/sphinx/arm/rst_arm_sources.mk
index af8295ce12fdc45c613f4151d22bfec0f4c36975..fde3c522554dfcff011dbbf2438881327705d9c0 100644 (file)
--- a/doc/sphinx/arm/rst_arm_sources.mk
+++ b/doc/sphinx/arm/rst_arm_sources.mk
@@ -1,33 +1,33 @@
-rst_arm_sources += %reldir%/acknowledgments.rst
-rst_arm_sources += %reldir%/admin.rst
-rst_arm_sources += %reldir%/agent.rst
-rst_arm_sources += %reldir%/classify.rst
-rst_arm_sources += %reldir%/config-backend.rst
-rst_arm_sources += %reldir%/config.rst
-rst_arm_sources += %reldir%/congestion-handling.rst
-rst_arm_sources += %reldir%/ctrl-channel.rst
-rst_arm_sources += %reldir%/ddns.rst
-rst_arm_sources += %reldir%/dhcp4-srv.rst
-rst_arm_sources += %reldir%/dhcp6-srv.rst
-rst_arm_sources += %reldir%/hammer.rst
-rst_arm_sources += %reldir%/hooks-bootp.rst
-rst_arm_sources += %reldir%/hooks-cb-cmds.rst
-rst_arm_sources += %reldir%/hooks-class-cmds.rst
-rst_arm_sources += %reldir%/hooks-ha.rst
-rst_arm_sources += %reldir%/hooks-host-cache.rst
-rst_arm_sources += %reldir%/hooks-lease-cmds.rst
-rst_arm_sources += %reldir%/hooks-lease-query.rst
-rst_arm_sources += %reldir%/hooks-radius.rst
-rst_arm_sources += %reldir%/hooks.rst
-rst_arm_sources += %reldir%/hooks-stat-cmds.rst
-rst_arm_sources += %reldir%/install.rst
-rst_arm_sources += %reldir%/intro.rst
-rst_arm_sources += %reldir%/keactrl.rst
-rst_arm_sources += %reldir%/lease-expiration.rst
-rst_arm_sources += %reldir%/lfc.rst
-rst_arm_sources += %reldir%/logging.rst
-rst_arm_sources += %reldir%/netconf.rst
-rst_arm_sources += %reldir%/quickstart.rst
-rst_arm_sources += %reldir%/shell.rst
-rst_arm_sources += %reldir%/stats.rst
-rst_arm_sources += %reldir%/stork.rst
+rst_arm_sources += arm/acknowledgments.rst
+rst_arm_sources += arm/admin.rst
+rst_arm_sources += arm/agent.rst
+rst_arm_sources += arm/classify.rst
+rst_arm_sources += arm/config-backend.rst
+rst_arm_sources += arm/config.rst
+rst_arm_sources += arm/congestion-handling.rst
+rst_arm_sources += arm/ctrl-channel.rst
+rst_arm_sources += arm/ddns.rst
+rst_arm_sources += arm/dhcp4-srv.rst
+rst_arm_sources += arm/dhcp6-srv.rst
+rst_arm_sources += arm/hammer.rst
+rst_arm_sources += arm/hooks-bootp.rst
+rst_arm_sources += arm/hooks-cb-cmds.rst
+rst_arm_sources += arm/hooks-class-cmds.rst
+rst_arm_sources += arm/hooks-ha.rst
+rst_arm_sources += arm/hooks-host-cache.rst
+rst_arm_sources += arm/hooks-lease-cmds.rst
+rst_arm_sources += arm/hooks-lease-query.rst
+rst_arm_sources += arm/hooks-radius.rst
+rst_arm_sources += arm/hooks.rst
+rst_arm_sources += arm/hooks-stat-cmds.rst
+rst_arm_sources += arm/install.rst
+rst_arm_sources += arm/intro.rst
+rst_arm_sources += arm/keactrl.rst
+rst_arm_sources += arm/lease-expiration.rst
+rst_arm_sources += arm/lfc.rst
+rst_arm_sources += arm/logging.rst
+rst_arm_sources += arm/netconf.rst
+rst_arm_sources += arm/quickstart.rst
+rst_arm_sources += arm/shell.rst
+rst_arm_sources += arm/stats.rst
+rst_arm_sources += arm/stork.rst

diff --git a/doc/sphinx/man/man8s.mk b/doc/sphinx/man/man8s.mk
index 44f3fe7264f5b53f4a6a2c9dba7ed450b2b4eec3..7af7c1f18c96560e0283fb605a1a1cd4ff966f7d 100644 (file)
--- a/doc/sphinx/man/man8s.mk
+++ b/doc/sphinx/man/man8s.mk
@@ -1,10 +1,10 @@
-man8s += $(sphinxbuilddir)/%reldir%/kea-admin.8
-man8s += $(sphinxbuilddir)/%reldir%/kea-ctrl-agent.8
-man8s += $(sphinxbuilddir)/%reldir%/kea-dhcp4.8
-man8s += $(sphinxbuilddir)/%reldir%/kea-dhcp6.8
-man8s += $(sphinxbuilddir)/%reldir%/kea-dhcp-ddns.8
-man8s += $(sphinxbuilddir)/%reldir%/kea-lfc.8
-man8s += $(sphinxbuilddir)/%reldir%/kea-netconf.8
-man8s += $(sphinxbuilddir)/%reldir%/kea-shell.8
-man8s += $(sphinxbuilddir)/%reldir%/keactrl.8
-man8s += $(sphinxbuilddir)/%reldir%/perfdhcp.8
+man8s += $(sphinxbuilddir)/man/kea-admin.8
+man8s += $(sphinxbuilddir)/man/kea-ctrl-agent.8
+man8s += $(sphinxbuilddir)/man/kea-dhcp4.8
+man8s += $(sphinxbuilddir)/man/kea-dhcp6.8
+man8s += $(sphinxbuilddir)/man/kea-dhcp-ddns.8
+man8s += $(sphinxbuilddir)/man/kea-lfc.8
+man8s += $(sphinxbuilddir)/man/kea-netconf.8
+man8s += $(sphinxbuilddir)/man/kea-shell.8
+man8s += $(sphinxbuilddir)/man/keactrl.8
+man8s += $(sphinxbuilddir)/man/perfdhcp.8

diff --git a/doc/sphinx/man/rst_man_sources.mk b/doc/sphinx/man/rst_man_sources.mk
index 0352f1dc65010398070f240d88dd250452ddce1d..933fafe23ea3ccb24a07ce10189fd6d5e872fb4b 100644 (file)
--- a/doc/sphinx/man/rst_man_sources.mk
+++ b/doc/sphinx/man/rst_man_sources.mk
@@ -1,10 +1,10 @@
-rst_man_sources += %reldir%/kea-admin.8.rst
-rst_man_sources += %reldir%/kea-ctrl-agent.8.rst
-rst_man_sources += %reldir%/kea-dhcp4.8.rst
-rst_man_sources += %reldir%/kea-dhcp6.8.rst
-rst_man_sources += %reldir%/kea-dhcp-ddns.8.rst
-rst_man_sources += %reldir%/kea-lfc.8.rst
-rst_man_sources += %reldir%/kea-netconf.8.rst
-rst_man_sources += %reldir%/kea-shell.8.rst
-rst_man_sources += %reldir%/keactrl.8.rst
-rst_man_sources += %reldir%/perfdhcp.8.rst
+rst_man_sources += man/kea-admin.8.rst
+rst_man_sources += man/kea-ctrl-agent.8.rst
+rst_man_sources += man/kea-dhcp4.8.rst
+rst_man_sources += man/kea-dhcp6.8.rst
+rst_man_sources += man/kea-dhcp-ddns.8.rst
+rst_man_sources += man/kea-lfc.8.rst
+rst_man_sources += man/kea-netconf.8.rst
+rst_man_sources += man/kea-shell.8.rst
+rst_man_sources += man/keactrl.8.rst
+rst_man_sources += man/perfdhcp.8.rst

diff --git a/doc/sphinx/static/static_sources.mk b/doc/sphinx/static/static_sources.mk
index a944f31a3ab44492076aecd16c0b7b5d3c01f97c..89ff7206fc3106d8a1806ed0021b1707687d4865 100644 (file)
--- a/doc/sphinx/static/static_sources.mk
+++ b/doc/sphinx/static/static_sources.mk
@@ -1,3 +1,3 @@
-static_sources += %reldir%/kea-imageonly-100bw.png
-static_sources += %reldir%/kea-logo-200.png
-static_sources += %reldir%/kea.css
+static_sources += static/kea-imageonly-100bw.png
+static_sources += static/kea-logo-200.png
+static_sources += static/kea.css