r16691 - in /trunk/libhtml-clean-perl/debian: changelog rules

[dmn at users.alioth.debian.org]

Author: dmn
Date: Fri Mar  7 08:11:30 2008
New Revision: 16691

URL: http://svn.debian.org/wsvn/?sc=1&rev=16691
Log:
* debian/rules: clean up
  + stop ignoring distclean errors
  + replace PREFIX by DESTDIR

Modified:
    trunk/libhtml-clean-perl/debian/changelog
    trunk/libhtml-clean-perl/debian/rules

Modified: trunk/libhtml-clean-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libhtml-clean-perl/debian/changelog?rev=16691&op=diff
==============================================================================
--- trunk/libhtml-clean-perl/debian/changelog (original)
+++ trunk/libhtml-clean-perl/debian/changelog Fri Mar  7 08:11:30 2008
@@ -9,6 +9,9 @@
 
   [ Damyan Ivanov ]
   * debian/watch: use dist-based URL, drop uupdate
+  * debian/rules: clean up
+    + stop ignoring distclean errors
+    + replace PREFIX by DESTDIR
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:29:40 +0200
 

Modified: trunk/libhtml-clean-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libhtml-clean-perl/debian/rules?rev=16691&op=diff
==============================================================================
--- trunk/libhtml-clean-perl/debian/rules (original)
+++ trunk/libhtml-clean-perl/debian/rules Fri Mar  7 08:11:30 2008
@@ -5,36 +5,31 @@
 PERL	?= /usr/bin/perl
 
 package	:= $(firstword $(shell dh_listpackages))
-prefix	:= $(CURDIR)/debian/$(package)/usr
-
-version	:= $(shell dpkg-parsechangelog | \
-			sed -ne 's/^Version: *\([0-9]\+:\)*//p')
+tmp	:= $(CURDIR)/debian/$(package)
 
 build:	build-stamp
 build-stamp:
 	dh_testdir
 	$(PERL) Makefile.PL INSTALLDIRS=vendor PERL=$(PERL)
-	$(MAKE) 
+	$(MAKE)
 	$(MAKE) test
 	touch $@
 
 clean:	checkroot
-	rm -f build-stamp
-	dh_clean
+	dh_clean build-stamp
 	# Remove the output from the test
 	rm -f t/testpages/t*.html
-	-$(MAKE) distclean
+	[ ! -e Makefile ] || $(MAKE) distclean
 
 binary-indep:	checkroot build
 	dh_clean
-	dh_installdirs
 
-	$(MAKE) install PREFIX=$(prefix)
+	$(MAKE) install DESTDIR=$(tmp)
 
 	# As this is a architecture independent package, we are not
 	# supposed to install stuff to /usr/lib. MakeMaker creates
 	# the dirs, we delete them from the deb:
-	[ ! -d $(prefix)/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(prefix)/lib/perl5
+	[ ! -d $(tmp)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(tmp)/usr/lib/perl5
 
 	dh_installdocs README TODO
 	dh_installchangelogs Changes