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 8354d4f93e3a9ef32dd03ed40042e125b547f50b..c8b73998af20b013267bcbc4cdfbd80ec71cd56d 100755 (executable)
--- 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 9b3d8b4ca150fff1e97850873f68d99311ea8407..808ed45a3a999b284686a9a3f9deceb092fb6fe0 100755 (executable)
--- 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!' \