Move pdns-recursor contrib to recursordist

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index ca4dcccacf5fae9a6f62dc7e6444583473f19e3a..7f44173e5c1cd986d906ed3803b58ff8a25f68ef 100644 (file)
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -29,6 +29,7 @@ EXTRA_DIST = \
        .version \
        botan110signers.cc botansigners.cc \
        build-aux/gen-version \
+       contrib/* \
        devpollmplexer.cc \
        dnslabeltext.cc \
        dnslabeltext.rl \

diff --git a/contrib/SMF/powerdns-recursor.xml b/pdns/recursordist/contrib/SMF-powerdns-recursor.xml
similarity index 100%
rename from contrib/SMF/powerdns-recursor.xml
rename to pdns/recursordist/contrib/SMF-powerdns-recursor.xml

diff --git a/contrib/systemd-pdns-recursor.service b/pdns/recursordist/contrib/systemd-pdns-recursor.service
similarity index 100%
rename from contrib/systemd-pdns-recursor.service
rename to pdns/recursordist/contrib/systemd-pdns-recursor.service

diff --git a/contrib/upstart-recursor.conf b/pdns/recursordist/contrib/upstart-recursor.conf
similarity index 100%
rename from contrib/upstart-recursor.conf
rename to pdns/recursordist/contrib/upstart-recursor.conf