From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 3 Jun 2024 12:37:35 +0000 (+0200)
Subject: Generate no more .conf-dist file
X-Git-Tag: rec-5.2.0-alpha0~3^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6cc9144d70be0664b1906e5150ff90cc243c395;p=thirdparty%2Fpdns.git

Generate no more .conf-dist file
---

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index a1a3ffc0b0..a1ddd51288 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -42,7 +42,7 @@ BUILT_SOURCES=htmlfiles.h \
 	dnslabeltext.cc
 
 CLEANFILES = htmlfiles.h \
-	recursor.conf-dist recursor.yml-dist
+	recursor.yml-dist
 
 htmlfiles.h: incfiles ${srcdir}/html/* ${srcdir}/html/js/*
 	$(AM_V_GEN)$(srcdir)/incfiles > $@.tmp
@@ -552,10 +552,7 @@ pubsuffix.cc: $(srcdir)/effective_tld_names.dat
 	$(srcdir)/mkpubsuffixcc $< $@
 
 ## Config file
-sysconf_DATA = recursor.conf-dist recursor.yml-dist
-
-recursor.conf-dist: pdns_recursor
-	$(AM_V_GEN)./pdns_recursor --config=default > $@
+sysconf_DATA = recursor.yml-dist
 
 recursor.yml-dist: pdns_recursor
 	dir=$$(mktemp -d) && touch "$$dir/recursor.yml" && ./pdns_recursor --config-dir="$$dir" --config=default 2> /dev/null > $@ && rm "$$dir/recursor.yml" && rmdir "$$dir"