r9841 - in /trunk/libxml-sax-perl/debian: changelog libxml-sax-perl.install rules

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

Author: ntyni-guest
Date: Tue Nov 27 18:59:35 2007
New Revision: 9841

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

Removed:
    trunk/libxml-sax-perl/debian/libxml-sax-perl.install
Modified:
    trunk/libxml-sax-perl/debian/changelog
    trunk/libxml-sax-perl/debian/rules

Modified: trunk/libxml-sax-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libxml-sax-perl/debian/changelog?rev=9841&op=diff
==============================================================================
--- trunk/libxml-sax-perl/debian/changelog (original)
+++ trunk/libxml-sax-perl/debian/changelog Tue Nov 27 18:59:35 2007
@@ -24,8 +24,9 @@
   * Remove generated files in the 'clean' target.
   * Add explanations in the examples to clarify why they look like
     stray maintainer scripts. (Closes: #295398)
+  * Minor debian/rules improvements.
 
- -- Niko Tyni <ntyni at iki.fi>  Sun, 25 Nov 2007 11:48:16 +0200
+ -- Niko Tyni <ntyni at iki.fi>  Sun, 25 Nov 2007 13:09:23 +0200
 
 libxml-sax-perl (0.16-0.1) unstable; urgency=low
 

Modified: trunk/libxml-sax-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libxml-sax-perl/debian/rules?rev=9841&op=diff
==============================================================================
--- trunk/libxml-sax-perl/debian/rules (original)
+++ trunk/libxml-sax-perl/debian/rules Tue Nov 27 18:59:35 2007
@@ -8,7 +8,13 @@
 #export DH_VERBOSE=1
 
 ## ----------------------------------------------------------------------
-TMP_DIR		= debian/tmp
+PACKAGE=$(shell dh_listpackages)
+
+ifndef PERL
+PERL = /usr/bin/perl
+endif
+
+TMP_DIR =$(CURDIR)/debian/$(PACKAGE)
 
 ## ----------------------------------------------------------------------
 ## targets
@@ -16,32 +22,33 @@
 clean:
 		dh_testdir
 		dh_testroot
+		dh_clean build-stamp install-stamp
+		# remove generated files
+		$(RM) XML-SAX-Base/lib/XML/SAX/*.pm
 		[ ! -f Makefile ] || $(MAKE) realclean
-		$(RM) XML-SAX-Base/lib/XML/SAX/*.pm
-		dh_clean
-		rm -f build-stamp install-stamp
 
 build:		build-stamp
 build-stamp:
 		dh_testdir
-		perl Makefile.PL INSTALLDIRS=vendor
-		$(MAKE) OPTIMIZE="-O2 -g -Wall"
+		$(PERL) Makefile.PL INSTALLDIRS=vendor \
+			INSTALLVENDORARCH=/usr/share/perl5/ \
+			VENDORARCHEXP=/usr/share/perl5/
+		$(MAKE)
 		$(MAKE) test
 		touch build-stamp
 
 install:	install-stamp
-install-stamp:	build
+install-stamp:	build-stamp
 		dh_testdir
 		dh_testroot
 		dh_clean -k
 		dh_installdirs
-		$(MAKE) install PREFIX=$(PWD)/$(TMP_DIR)/usr
+		$(MAKE) install PREFIX=$(TMP_DIR)/usr
 		touch install-stamp
 
 binary-indep:	build install
 		dh_testdir
 		dh_testroot
-		dh_install --sourcedir=$(TMP_DIR)
 		dh_installman
 		dh_installdocs
 		dh_installexamples