[Pkg-samba-maint] r2507 - trunk/samba4/debian

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2009-01-25 19:58:51 +0000 (Sun, 25 Jan 2009)
New Revision: 2507

Modified:
   trunk/samba4/debian/rules
Log:
Use convenience variable for debian/tmp.

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2009-01-25 19:46:54 UTC (rev 2506)
+++ trunk/samba4/debian/rules	2009-01-25 19:58:51 UTC (rev 2507)
@@ -2,6 +2,7 @@
 # By Jelmer Vernooij <jelmer at samba.org>
 
 SOURCEPATH=./source4
+DESTDIR = $(CURDIR)/debian/tmp
 
 PYVERS=$(shell pyversions -vr)
 
@@ -37,7 +38,7 @@
 	dh_testdir
 	dh_testroot
 	dh_clean
-	$(RM) debian/tmp
+	$(RM) $(DESTDIR)
 	[ ! -f $(SOURCEPATH)/mkconfig.mk ] || [ ! -f $(SOURCEPATH)/data.mk ] || $(MAKE) -C $(SOURCEPATH) clean
 	$(RM) build-stamp configure-stamp
 
@@ -54,45 +55,45 @@
 
 install: build
 	dh_installdirs
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/man/man1
-	mkdir -p $(CURDIR)/debian/tmp/etc/samba
-	$(MAKE) -C $(SOURCEPATH) install DESTDIR=$(CURDIR)/debian/tmp
-	$(MAKE) -C $(SOURCEPATH) manpages installman DESTDIR=$(CURDIR)/debian/tmp
-	install -m 755 $(CURDIR)/debian/panic-action $(CURDIR)/debian/tmp/usr/share/samba
-	install -m 644 $(CURDIR)/debian/gdbcommands $(CURDIR)/debian/tmp/etc/samba
+	mkdir -p $(DESTDIR)/usr/share/man/man1
+	mkdir -p $(DESTDIR)/etc/samba
+	$(MAKE) -C $(SOURCEPATH) install DESTDIR=$(DESTDIR)
+	$(MAKE) -C $(SOURCEPATH) manpages installman DESTDIR=$(DESTDIR)
+	install -m 755 $(CURDIR)/debian/panic-action $(DESTDIR)/usr/share/samba
+	install -m 644 $(CURDIR)/debian/gdbcommands $(DESTDIR)/etc/samba
 	dh_testdir
 	dh_testroot
 	# Remove files created when running install more than once
-	find debian/tmp -name "*.old" | xargs rm -f
+	find $(DESTDIR) -name "*.old" | xargs rm -f
 	# Alternatives are used
-	mv $(CURDIR)/debian/tmp/usr/bin/smbtorture $(CURDIR)/debian/tmp/usr/bin/smbtorture.samba4-testsuite
-	mv $(CURDIR)/debian/tmp/usr/bin/nsstest $(CURDIR)/debian/tmp/usr/bin/nsstest.samba4
-	mv $(CURDIR)/debian/tmp/usr/bin/smbstatus $(CURDIR)/debian/tmp/usr/bin/smbstatus.samba4
-	mv $(CURDIR)/debian/tmp/usr/bin/masktest $(CURDIR)/debian/tmp/usr/bin/masktest.samba4
-	mv $(CURDIR)/debian/tmp/usr/bin/locktest $(CURDIR)/debian/tmp/usr/bin/locktest.samba4
+	mv $(DESTDIR)/usr/bin/smbtorture $(DESTDIR)/usr/bin/smbtorture.samba4-testsuite
+	mv $(DESTDIR)/usr/bin/nsstest $(DESTDIR)/usr/bin/nsstest.samba4
+	mv $(DESTDIR)/usr/bin/smbstatus $(DESTDIR)/usr/bin/smbstatus.samba4
+	mv $(DESTDIR)/usr/bin/masktest $(DESTDIR)/usr/bin/masktest.samba4
+	mv $(DESTDIR)/usr/bin/locktest $(DESTDIR)/usr/bin/locktest.samba4
 	# Already provided by libparse-yapp-perl
-	rm -f $(CURDIR)/debian/tmp/usr/share/perl5/Parse/Yapp/Driver.pm
+	rm -f $(DESTDIR)/usr/share/perl5/Parse/Yapp/Driver.pm
 	# Binaries not ready for installation
-	rm -f $(CURDIR)/debian/tmp/usr/bin/subunitrun
-	rm -f $(CURDIR)/debian/tmp/usr/bin/winreg
-	rm -f $(CURDIR)/debian/tmp/usr/bin/samba3dump
-	rm -f $(CURDIR)/debian/tmp/usr/bin/epdump
-	rm -f $(CURDIR)/debian/tmp/usr/bin/winreg.py
-	rm -f $(CURDIR)/debian/tmp/usr/bin/minschema
-	rm -f $(CURDIR)/debian/tmp/usr/bin/rpcclient
+	rm -f $(DESTDIR)/usr/bin/subunitrun
+	rm -f $(DESTDIR)/usr/bin/winreg
+	rm -f $(DESTDIR)/usr/bin/samba3dump
+	rm -f $(DESTDIR)/usr/bin/epdump
+	rm -f $(DESTDIR)/usr/bin/winreg.py
+	rm -f $(DESTDIR)/usr/bin/minschema
+	rm -f $(DESTDIR)/usr/bin/rpcclient
 	# No need to do development using nss_winbind
-	rm -f $(CURDIR)/debian/tmp/usr/lib/libnss_winbind.so
-	rm -f $(CURDIR)/debian/tmp/usr/lib/pkgconfig/nss_winbind.pc
-	rm -f $(CURDIR)/debian/tmp/usr/share/man/man3/talloc.3
-	rm -f $(CURDIR)/debian/tmp/usr/lib/python*/site-packages/tdb.so
-	rm -f $(CURDIR)/debian/tmp/usr/lib/python*/site-packages/uuid.so
-	rm -rf $(CURDIR)/debian/tmp/usr/lib/python*/site-packages/subunit*
-	rm -rf $(CURDIR)/debian/tmp/usr/lib/python*/lib/subunit
-	rm -f $(CURDIR)/debian/tmp/usr/bin/tdb*
-	rm -f $(CURDIR)/debian/tmp/usr/bin/autoidl
-	rm -f $(CURDIR)/debian/tmp/usr/lib/pkgconfig/events.pc
-	rm -f $(CURDIR)/debian/tmp/usr/bin/mymachinepw
-	dh_install --sourcedir=debian/tmp --list-missing --fail-missing
+	rm -f $(DESTDIR)/usr/lib/libnss_winbind.so
+	rm -f $(DESTDIR)/usr/lib/pkgconfig/nss_winbind.pc
+	rm -f $(DESTDIR)/usr/share/man/man3/talloc.3
+	rm -f $(DESTDIR)/usr/lib/python*/site-packages/tdb.so
+	rm -f $(DESTDIR)/usr/lib/python*/site-packages/uuid.so
+	rm -rf $(DESTDIR)/usr/lib/python*/site-packages/subunit*
+	rm -rf $(DESTDIR)/usr/lib/python*/lib/subunit
+	rm -f $(DESTDIR)/usr/bin/tdb*
+	rm -f $(DESTDIR)/usr/bin/autoidl
+	rm -f $(DESTDIR)/usr/lib/pkgconfig/events.pc
+	rm -f $(DESTDIR)/usr/bin/mymachinepw
+	dh_install --sourcedir=$(DESTDIR) --list-missing --fail-missing
 
 get-orig-source:
 	./debian/build-orig.sh