From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 21 Jan 2016 12:38:03 +0000 (+0100)
Subject: Install generated recursor.conf-dist in sysconfdir
X-Git-Tag: dnsdist-1.0.0-alpha2~38^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f0d6d583869d0fd8d937ff7cd598cba571024cc;p=thirdparty%2Fpdns.git

Install generated recursor.conf-dist in sysconfdir
---

diff --git a/build-scripts/build-recursor-rpm b/build-scripts/build-recursor-rpm
index 3612c4b5f6..9d536c560b 100755
--- a/build-scripts/build-recursor-rpm
+++ b/build-scripts/build-recursor-rpm
@@ -150,8 +150,7 @@ make %{?_smp_mflags}
 %{__rm} -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 %{__install} -D -p %{SOURCE1} %{buildroot}%{_initrddir}/pdns-recursor
-%{buildroot}/%{_sbindir}/pdns_recursor --config > %{buildroot}%{_sysconfdir}/%{name}/recursor.conf
-%{__rm} %{buildroot}%{_sysconfdir}/%{name}/recursor.conf-dist
+%{__mv} %{buildroot}%{_sysconfdir}/%{name}/recursor.conf-dist %{buildroot}%{_sysconfdir}/%{name}/recursor.conf
 
 # add pdns user and group to top of configfile
 sed -i '1i\\setuid=pdns-recursor' %{buildroot}%{_sysconfdir}/%{name}/recursor.conf
@@ -240,8 +239,7 @@ make %{?_smp_mflags}
 make install DESTDIR=%{buildroot}
 # install systemd unit file
 %{__install} -D -p -m 644 contrib/systemd-pdns-recursor.service %{buildroot}%{_unitdir}/%{name}.service
-%{buildroot}/%{_sbindir}/pdns_recursor --config > %{buildroot}%{_sysconfdir}/%{name}/recursor.conf
-%{__rm} %{buildroot}%{_sysconfdir}/%{name}/recursor.conf-dist
+%{__mv} %{buildroot}%{_sysconfdir}/%{name}/recursor.conf-dist %{buildroot}%{_sysconfdir}/%{name}/recursor.conf
 
 # add pdns user and group to top of configfile
 sed -i '1i\\setuid=pdns-recursor' %{buildroot}%{_sysconfdir}/%{name}/recursor.conf
diff --git a/pdns/recursordist/.gitignore b/pdns/recursordist/.gitignore
index 235d339e4d..213939e198 100644
--- a/pdns/recursordist/.gitignore
+++ b/pdns/recursordist/.gitignore
@@ -33,5 +33,6 @@
 /pdns_recursor
 /rec_control
 /pdns-recursor-*
+/recursor.conf-dist
 /ext/Makefile
 /ext/Makefile.in
diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 7f44173e5c..65545314e4 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -192,6 +192,13 @@ $(srcdir)/effective_tld_names.dat:
 pubsuffix.cc: $(srcdir)/effective_tld_names.dat
 	$(AM_V_GEN)./mkpubsuffixcc
 
+## Config file
+sysconf_DATA = recursor.conf-dist
+
+recursor.conf-dist: pdns_recursor
+	$(AM_V_GEN)./pdns_recursor --config > $@
+
+## Manpages
 MANPAGES=pdns_recursor.1 \
 	 rec_control.1