From: Christian Hofstaedtler <christian.hofstaedtler@deduktiva.com>
Date: Fri, 13 May 2016 16:45:14 +0000 (+0200)
Subject: build scripts: Stop patching config-dir in pdns.conf
X-Git-Tag: auth-4.0.0-beta1~28^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3859%2Fhead;p=thirdparty%2Fpdns.git

build scripts: Stop patching config-dir in pdns.conf

By the time this is read, it is too late anyway.
---

diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm
index 8354d4f93e..c8b73998af 100755
--- a/build-scripts/build-auth-rpm
+++ b/build-scripts/build-auth-rpm
@@ -449,7 +449,6 @@ make install DESTDIR=%{buildroot}
 %{__rm} -f %{buildroot}%{_libdir}/%{name}/*.la
 %{__rm} -rf %{buildroot}%{_docdir}
 %{buildroot}/usr/sbin/pdns_server --no-config --config | sed \
-  -e 's!# config-dir=.*!config-dir=%{_sysconfdir}%{name}!' \
   -e 's!# daemon=.*!daemon=no!' \
   -e 's!# guardian=.*!guardian=no!' \
   -e 's!# launch=.*!&\\nlaunch=!' \
@@ -705,7 +704,6 @@ make install DESTDIR=%{buildroot}
 %{__rm} -f %{buildroot}%{_libdir}/%{name}/*.la
 %{__rm} -rf %{buildroot}/usr/share/doc
 %{buildroot}/usr/sbin/pdns_server --no-config --config | sed \
-  -e 's!# config-dir=.*!config-dir=%{_sysconfdir}%{name}!' \
   -e 's!# daemon=.*!daemon=yes!' \
   -e 's!# guardian=.*!guardian=yes!' \
   -e 's!# launch=.*!&\\nlaunch=!' \
diff --git a/build-scripts/debian-authoritative/rules b/build-scripts/debian-authoritative/rules
index 9b3d8b4ca1..808ed45a3a 100755
--- a/build-scripts/debian-authoritative/rules
+++ b/build-scripts/debian-authoritative/rules
@@ -74,7 +74,6 @@ override_dh_installinit:
 override_dh_install:
 	dh_install
 	./pdns/pdns_server --no-config --config | sed \
-	  -e 's!# config-dir=.*!config-dir=/etc/powerdns!' \
 	  -e 's!# daemon=.*!daemon=yes!' \
 	  -e 's!# guardian=.*!guardian=yes!' \
 	  -e 's!# include-dir=.*!&\ninclude-dir=/etc/powerdns/pdns.d!' \