2007-07-05 Roland McGrath <roland@redhat.com>

	* debian/rules: Use debian/$(package) instead of debian/tmp as temp dir.

diff --git a/debian/rules b/debian/rules
index 69a9af9b21c630860a67299442f7f7dff0967c63..308e0015f9814fa5ed149c8e36bb73ee7551b065 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ build64/Makefile:
        cd $(@D); CC="$(CC64)" sh ../configure --prefix=/usr --build=$(DEB_BUILD_GNU_TYPE) --host=$(HOST64)
 
 clean:
-       rm -rf debian/tmp debian/substvars debian/files debian/files~
+       rm -rf debian/$(package) debian/substvars debian/files debian/files~
        rm -rf build64 stamp-build64
        rm -rf build stamp-build
 
@@ -57,47 +57,50 @@ binary-indep:
 
 binary-arch: $(extra_build_targets) build checkroot
        test -f stamp-build || make $(MFLAGS) -f debian/rules build
-       -rm -rf debian/tmp debian/files debian/substvars
+       -rm -rf debian/$(package) debian/files debian/substvars
 
-       install -d -m 755 -o root -g root debian/tmp
+       install -d -m 755 -o root -g root debian/$(package)
        # reset the mode to work around a bug in install
-       chown 755 debian/tmp
-       install -d -m 755 -o root -g root debian/tmp/DEBIAN
+       chown 755 debian/$(package)
+       install -d -m 755 -o root -g root debian/$(package)/DEBIAN
 
 # Install strace
-       install -d -o root -g root -m 755 debian/tmp/usr/bin
-       install -o root -g root -m 755 build/strace debian/tmp/usr/bin/strace
+       install -d -o root -g root -m 755 debian/$(package)/usr/bin
+       install -o root -g root -m 755 build/strace \
+               debian/$(package)/usr/bin/strace
        dh_strip
 
        dpkg-gencontrol -is -pstrace-udeb -fdebian/files~
-       dpkg-deb --build debian/tmp ../$(UDEB)
+       dpkg-deb --build debian/$(package) ../$(UDEB)
        dpkg-distaddfile $(UDEB) debian-installer extra
 
 # Install documentation
-       install -d -o root -g root -m 755 debian/tmp/usr/share/doc/$(package)
-       install -d -o root -g root -m 755 debian/tmp/usr/share/man/man1
+       install -d -o root -g root -m 755 \
+               debian/$(package)/usr/share/doc/$(package)
+       install -d -o root -g root -m 755 debian/$(package)/usr/share/man/man1
        install -p -o root -g root -m 644 debian/changelog \
-                       debian/tmp/usr/share/doc/$(package)/changelog.Debian
+               debian/$(package)/usr/share/doc/$(package)/changelog.Debian
        install -p -o root -g root -m 644 TODO \
-                       debian/tmp/usr/share/doc/$(package)/TODO
+               debian/$(package)/usr/share/doc/$(package)/TODO
        install -p -o root -g root -m 644 NEWS \
-                       debian/tmp/usr/share/doc/$(package)/changelog
-       gzip -9 debian/tmp/usr/share/doc/$(package)/*
+               debian/$(package)/usr/share/doc/$(package)/changelog
+       gzip -9 debian/$(package)/usr/share/doc/$(package)/*
        install -p -o root -g root -m 644 debian/copyright \
-                       debian/tmp/usr/share/doc/$(package)/copyright
-       install -p -o root -g root -m 644 strace.1 debian/tmp/usr/share/man/man1/strace.1
-       gzip -9 debian/tmp/usr/share/man/man1/strace.1
+               debian/$(package)/usr/share/doc/$(package)/copyright
+       install -p -o root -g root -m 644 strace.1 \
+               debian/$(package)/usr/share/man/man1/strace.1
+       gzip -9 debian/$(package)/usr/share/man/man1/strace.1
 
 ifeq ($(build64),yes)
-       install -o root -g root -m 755 build64/strace debian/tmp/usr/bin/strace64
-       ln -s strace.1.gz debian/tmp/usr/share/man/man1/strace64.1.gz
+       install -o root -g root -m 755 build64/strace debian/$(package)/usr/bin/strace64
+       ln -s strace.1.gz debian/$(package)/usr/share/man/man1/strace64.1.gz
        dh_strip
 endif
 
        dpkg-shlibdeps build/strace $(patsubst yes,build64/strace,$(build64))
 
        dpkg-gencontrol -is -pstrace
-       dpkg-deb --build debian/tmp ..
+       dpkg-deb --build debian/$(package) ..
 
 checkroot:
        test root = "`whoami`"