Adjust debian/rules for new paths

diff --git a/debian/rules b/debian/rules
index c92279bffb536dbfbc328b88f1d415314d7a940a..7b3d4ebbff2b77995727070556c9a47106188c06 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 
-tmpdir         := $(shell pwd)/debian-pdns/tmp
-be_tmpdir      := $(shell pwd)/debian-pdns/tmp-backend
-tools_tmpdir:= $(shell pwd)/debian-pdns/tmp-tools
+tmpdir         := $(shell pwd)/debian/tmp
+be_tmpdir      := $(shell pwd)/debian/tmp-backend
+tools_tmpdir:= $(shell pwd)/debian/tmp-tools
 backends       := bind opendbx ldap pipe gmysql gpgsql gsqlite3 random
 debs           := bind opendbx ldap pipe pgsql sqlite sqlite3 random
 
@@ -20,23 +20,23 @@ binary-doc:
 
        install -d -m 755 -o root -g root \
                "$(tmpdir)"/usr/share/doc/pdns-doc
-       install -p -m 644 -o root -g root debian-pdns/changelog \
+       install -p -m 644 -o root -g root debian/changelog \
                        "$(tmpdir)"/usr/share/doc/pdns-doc/changelog.Debian
        gzip -9 "$(tmpdir)"/usr/share/doc/pdns-doc/*
-       install -p -m 644 -o root -g root debian-pdns/copyright \
+       install -p -m 644 -o root -g root debian/copyright \
                        "$(tmpdir)"/usr/share/doc/pdns-doc/
 
        install -d -m 755 -o root -g root "$(tmpdir)"/usr/share/doc-base
-       install -p -m 644 -o root -g root debian-pdns/doc-base \
+       install -p -m 644 -o root -g root debian/doc-base \
                        "$(tmpdir)"/usr/share/doc-base/pdns
 
        install -d -m 755 -o root -g root "$(tmpdir)"/DEBIAN
-       install -p -m 755 -o root -g root debian-pdns/pdns-doc.prerm \
+       install -p -m 755 -o root -g root debian/pdns-doc.prerm \
                        "$(tmpdir)"/DEBIAN/prerm
-       install -p -m 755 -o root -g root debian-pdns/pdns-doc.postinst \
+       install -p -m 755 -o root -g root debian/pdns-doc.postinst \
                        "$(tmpdir)"/DEBIAN/postinst
 
-       dpkg-gencontrol -fdebian-pdns/files -cdebian-pdns/control -ldebian-pdns/changelog -isp -ppdns-doc -P"$(tmpdir)"
+       dpkg-gencontrol -fdebian/files -cdebian/control -ldebian/changelog -isp -ppdns-doc -P"$(tmpdir)"
        dpkg --build "$(tmpdir)" ..
 
 
@@ -77,7 +77,7 @@ build stamp-build: configure
 
 
 binary-main-prepare: 
-       rm -f debian-pdns/substvars
+       rm -f debian/substvars
        rm -rf "$(tmpdir)" "$(tmpdir)"-*
        rm -rf "$(tools_tmpdir)" "$(tools_tmpdir)"-*
        install -d -m 755 -o root -g root "$(tmpdir)"
@@ -101,20 +101,20 @@ binary-main-prepare:
 
        install -d -m 755 -o root -g root \
                "$(tmpdir)"/usr/share/doc/pdns
-       install -p -m 644 -o root -g root debian-pdns/changelog \
+       install -p -m 644 -o root -g root debian/changelog \
                        "$(tmpdir)"/usr/share/doc/pdns/changelog.Debian
        gzip -9 "$(tmpdir)"/usr/share/doc/pdns/c*
-       install -p -m 644 -o root -g root debian-pdns/copyright \
+       install -p -m 644 -o root -g root debian/copyright \
                        "$(tmpdir)"/usr/share/doc/pdns/
        
        install -d -m 755 -o root -g root "$(tmpdir)"/DEBIAN
-       install -p -m 755 -o root -g root debian-pdns/pdns.prerm \
+       install -p -m 755 -o root -g root debian/pdns.prerm \
                        "$(tmpdir)"/DEBIAN/prerm
-       install -p -m 755 -o root -g root debian-pdns/pdns.postrm \
+       install -p -m 755 -o root -g root debian/pdns.postrm \
                        "$(tmpdir)"/DEBIAN/postrm
-       install -p -m 755 -o root -g root debian-pdns/pdns.postinst \
+       install -p -m 755 -o root -g root debian/pdns.postinst \
                        "$(tmpdir)"/DEBIAN/postinst
-       install -p -m 644 -o root -g root debian-pdns/pdns.conffiles \
+       install -p -m 644 -o root -g root debian/pdns.conffiles \
                        "$(tmpdir)"/DEBIAN/conffiles
 
 
@@ -126,10 +126,10 @@ binary-main-prepare:
                "$(tools_tmpdir)"/usr/share/man/man1
        install -d -m 755 -o root -g root \
                "$(tools_tmpdir)"/usr/share/doc/pdns-tools
-       install -p -m 644 -o root -g root debian-pdns/changelog \
+       install -p -m 644 -o root -g root debian/changelog \
                        "$(tools_tmpdir)"/usr/share/doc/pdns-tools/changelog.Debian
        gzip -9 "$(tools_tmpdir)"/usr/share/doc/pdns-tools/c*
-       install -p -m 644 -o root -g root debian-pdns/copyright \
+       install -p -m 644 -o root -g root debian/copyright \
                        "$(tools_tmpdir)"/usr/share/doc/pdns-tools/
 
        install -d -m 755 -o root -g root "$(tools_tmpdir)"/DEBIAN
@@ -150,16 +150,16 @@ binary-main-prepare:
 
 
 binary-main: stamp-build binary-main-prepare
-       dpkg-shlibdeps -Tdebian-pdns/substvars "$(tmpdir)"/usr/bin/zone2sql \
+       dpkg-shlibdeps -Tdebian/substvars "$(tmpdir)"/usr/bin/zone2sql \
                "$(tmpdir)"/usr/sbin/pdns_server \
                "$(tmpdir)"/usr/bin/pdns_control
-       dpkg-gencontrol -fdebian-pdns/files -cdebian-pdns/control -ldebian-pdns/changelog  -isp -ppdns -P"$(tmpdir)"
+       dpkg-gencontrol -fdebian/files -cdebian/control -ldebian/changelog  -isp -ppdns -P"$(tmpdir)"
        dpkg --build "$(tmpdir)" ..
 
 
 binary-static: stamp-build-static binary-main-prepare
-       dpkg-gencontrol -fdebian-pdns/files -cdebian-pdns/control -ldebian-pdns/changelog  -isp -ppdns-static -P"$(tmpdir)"
-       dpkg-gencontrol -fdebian-pdns/files -cdebian-pdns/control -ldebian-pdns/changelog  -isp -ppdns-tools -P"$(tools_tmpdir)"
+       dpkg-gencontrol -fdebian/files -cdebian/control -ldebian/changelog  -isp -ppdns-static -P"$(tmpdir)"
+       dpkg-gencontrol -fdebian/files -cdebian/control -ldebian/changelog  -isp -ppdns-tools -P"$(tools_tmpdir)"
        dpkg --build "$(tmpdir)" ..
        dpkg --build "$(tools_tmpdir)" ..
 
@@ -172,7 +172,7 @@ binary-backend: stamp-build
        chmod 644 "$(tmpdir)"/usr/lib/powerdns/*
 
        set -e ; for be in $(debs) ; do \
-               rm -f debian-pdns/substvars ; \
+               rm -f debian/substvars ; \
                rm -rf "$(be_tmpdir)" ; \
                pkg=pdns-backend-$$be ; \
                \
@@ -185,8 +185,8 @@ binary-backend: stamp-build
                ln -s pdns "$(be_tmpdir)"/usr/share/doc/$$pkg ; \
                \
                install -d -m 755 -o root -g root "$(be_tmpdir)"/DEBIAN ; \
-               dpkg-shlibdeps -Tdebian-pdns/substvars "$(be_tmpdir)"/usr/lib/powerdns/*.so ; \
-               dpkg-gencontrol -fdebian-pdns/files -cdebian-pdns/control -ldebian-pdns/changelog  -isp -p$$pkg -P"$(be_tmpdir)" ; \
+               dpkg-shlibdeps -Tdebian/substvars "$(be_tmpdir)"/usr/lib/powerdns/*.so ; \
+               dpkg-gencontrol -fdebian/files -cdebian/control -ldebian/changelog  -isp -p$$pkg -P"$(be_tmpdir)" ; \
                dpkg --build "$(be_tmpdir)" .. ; \
        done
 
@@ -198,7 +198,7 @@ binary-arch: binary-main binary-backend
 clean:
        -make distclean
        -make -C pdns/docs clean
-       rm -f debian-pdns/files debian-pdns/substvars stamp-build stamp-build-static
+       rm -f debian/files debian/substvars stamp-build stamp-build-static
        rm -rf "$(tmpdir)" "$(be_tmpdir)"
 
 .PHONY: clean build binary binary-arch binary-indep