Commit 117561c3 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[3534] Fixed generation of the default Kea configuration file.

parent d630dfc7
...@@ -1391,7 +1391,6 @@ AC_CONFIG_FILES([compatcheck/Makefile ...@@ -1391,7 +1391,6 @@ AC_CONFIG_FILES([compatcheck/Makefile
src/bin/dhcp6/tests/test_data_files_config.h src/bin/dhcp6/tests/test_data_files_config.h
src/bin/dhcp6/tests/test_libraries.h src/bin/dhcp6/tests/test_libraries.h
src/bin/keactrl/Makefile src/bin/keactrl/Makefile
src/bin/keactrl/kea.conf
src/bin/keactrl/keactrl src/bin/keactrl/keactrl
src/bin/keactrl/keactrl.conf src/bin/keactrl/keactrl.conf
src/bin/keactrl/tests/Makefile src/bin/keactrl/tests/Makefile
......
...@@ -8,8 +8,9 @@ sbin_SCRIPTS = keactrl ...@@ -8,8 +8,9 @@ sbin_SCRIPTS = keactrl
CONFIGFILES = keactrl.conf kea.conf CONFIGFILES = keactrl.conf kea.conf
man_MANS = keactrl.8 man_MANS = keactrl.8
DISTCLEANFILES = keactrl $(CONFIGFILES) $(man_MANS) DISTCLEANFILES = keactrl keactrl.conf $(man_MANS)
EXTRA_DIST = keactrl.in keactrl.conf.in kea.conf.in $(man_MANS) keactrl.xml CLEANFILES = kea.conf
EXTRA_DIST = keactrl.in keactrl.conf.in kea.conf.pre $(man_MANS) keactrl.xml
# kea.conf is not really a source used for building other targets, but we need # kea.conf is not really a source used for building other targets, but we need
# this file to be generated before make install is called. # this file to be generated before make install is called.
...@@ -28,8 +29,8 @@ $(man_MANS): ...@@ -28,8 +29,8 @@ $(man_MANS):
endif endif
kea.conf: kea.conf.in kea.conf: kea.conf.pre
$(top_srcdir)/tools/path_replacer.sh $< $@ $(top_srcdir)/tools/path_replacer.sh $(builddir)/kea.conf.pre $@
if INSTALL_CONFIGURATIONS if INSTALL_CONFIGURATIONS
......
/path_replacer.sh
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment