r9935 - in /trunk/libdbix-searchbuilder-perl/debian: changelog rules

[ntyni-guest at users.alioth.debian.org]

Author: ntyni-guest
Date: Wed Nov 28 19:07:41 2007
New Revision: 9935

URL: http://svn.debian.org/wsvn/?sc=1&rev=9935
Log:
* Minor improvements to debian/rules.

Modified:
    trunk/libdbix-searchbuilder-perl/debian/changelog
    trunk/libdbix-searchbuilder-perl/debian/rules

Modified: trunk/libdbix-searchbuilder-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/debian/changelog?rev=9935&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/debian/changelog (original)
+++ trunk/libdbix-searchbuilder-perl/debian/changelog Wed Nov 28 19:07:41 2007
@@ -7,8 +7,9 @@
 
   [ Niko Tyni ]
   * New upstream release.
-
- -- Niko Tyni <ntyni at iki.fi>  Wed, 28 Nov 2007 20:30:30 +0200
+  * Minor improvements to debian/rules.
+
+ -- Niko Tyni <ntyni at iki.fi>  Wed, 28 Nov 2007 20:34:16 +0200
 
 libdbix-searchbuilder-perl (1.49-1) unstable; urgency=low
 

Modified: trunk/libdbix-searchbuilder-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/debian/rules?rev=9935&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/debian/rules (original)
+++ trunk/libdbix-searchbuilder-perl/debian/rules Wed Nov 28 19:07:41 2007
@@ -21,35 +21,32 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	PERL_AUTOINSTALL=--skip $(PERL) Makefile.PL INSTALLDIRS=vendor
-	touch configure-stamp
+	PERL_AUTOINSTALL=--skip $(PERL) Makefile.PL INSTALLDIRS=vendor \
+		INSTALLVENDORARCH=/usr/share/perl5/ \
+		VENDORARCHEXP=/usr/share/perl5/
+	touch $@
 
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
 	$(MAKE)
 	$(MAKE) test
-	touch build-stamp
+	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-
+	dh_clean configure-stamp build-stamp install-stamp
 	[ ! -e Makefile ] || $(MAKE) distclean
 
-	dh_clean configure-stamp build-stamp install-stamp
-
 install: install-stamp
-install-stamp:
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
-	$(MAKE) install PREFIX=$(TMP)/usr
-	# Remove any empty directories
-	find $(TMP)/usr -type d -empty -print0 | xargs --no-run-if-empty --null rmdir -p --ignore-fail-on-non-empty
-	touch install-stamp
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+	touch $@
 
 # Build architecture-independent files here.
 binary-arch: build install