r8691 - in /trunk/libchemistry-elements-perl/debian: changelog rules

[djpig at users.alioth.debian.org]

Author: djpig
Date: Tue Oct 30 07:24:42 2007
New Revision: 8691

URL: http://svn.debian.org/wsvn/?sc=1&rev=8691
Log:
debian/rules: Major clean-up: Move make and make test to build,
introduce proper build-stamp, let install actually depend on build,
use proper DESTDIR and PREFIX instead of just PREFIX. Aside from
other problems this also fixes a misbuild with dpkg-buildpackage -j,
found by Daniel Schepler.

Modified:
    trunk/libchemistry-elements-perl/debian/changelog
    trunk/libchemistry-elements-perl/debian/rules

Modified: trunk/libchemistry-elements-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libchemistry-elements-perl/debian/changelog?rev=8691&op=diff
==============================================================================
--- trunk/libchemistry-elements-perl/debian/changelog (original)
+++ trunk/libchemistry-elements-perl/debian/changelog Tue Oct 30 07:24:42 2007
@@ -1,10 +1,18 @@
 libchemistry-elements-perl (1.04-3) UNRELEASED; urgency=low
 
+  [ gregor herrmann ]
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
     field (source stanza); Homepage field (source stanza). Removed: XS-
     Vcs-Svn fields.
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:27:56 +0200
+  [ Frank Lichtenheld ]
+  * debian/rules: Major clean-up: Move make and make test to build,
+    introduce proper build-stamp, let install actually depend on build,
+    use proper DESTDIR and PREFIX instead of just PREFIX. Aside from
+    other problems this also fixes a misbuild with dpkg-buildpackage -j,
+    found by Daniel Schepler.
+
+ -- Frank Lichtenheld <djpig at debian.org>  Tue, 30 Oct 2007 08:22:04 +0100
 
 libchemistry-elements-perl (1.04-2) unstable; urgency=low
 

Modified: trunk/libchemistry-elements-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libchemistry-elements-perl/debian/rules?rev=8691&op=diff
==============================================================================
--- trunk/libchemistry-elements-perl/debian/rules (original)
+++ trunk/libchemistry-elements-perl/debian/rules Tue Oct 30 07:24:42 2007
@@ -10,23 +10,29 @@
                         perl -nle 'm/\S+\s+\((\S+)\)/ && print $$1')
 debtmp  := $(CURDIR)/debian/$(package)
 
-build:
+build: build-stamp
+build-stamp:
 	dh_testdir
 	# Add here commands to compile the package.
 	perl Makefile.PL verbose INSTALLDIRS=vendor
+	$(MAKE)
+	$(MAKE) test
+
+	touch build-stamp
+
 clean:
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) clean
 	rm -f Makefile.old
-	dh_clean
+	dh_clean build-stamp
 
-install:
+install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) PREFIX=$(debtmp)/usr test install
+	$(MAKE) DESTDIR="$(debtmp)" PREFIX=/usr install
 	rm -rf $(debtmp)/usr/lib
 
 binary-indep: build install
@@ -52,4 +58,4 @@
 binary-arch: build install
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install