r10728 - in /trunk/libcrypt-rijndael-perl/debian: changelog rules

[dmn at users.alioth.debian.org]

Author: dmn
Date: Sun Dec  2 17:43:01 2007
New Revision: 10728

URL: http://svn.debian.org/wsvn/?sc=1&rev=10728
Log:
* Clean up debian/rules
  + fix inter-target dependencies
  + unpatch before distclean; touch Makefile to avoid it being rebuilt due
    to unpatched Makefile.PL

Modified:
    trunk/libcrypt-rijndael-perl/debian/changelog
    trunk/libcrypt-rijndael-perl/debian/rules

Modified: trunk/libcrypt-rijndael-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libcrypt-rijndael-perl/debian/changelog?rev=10728&op=diff
==============================================================================
--- trunk/libcrypt-rijndael-perl/debian/changelog (original)
+++ trunk/libcrypt-rijndael-perl/debian/changelog Sun Dec  2 17:43:01 2007
@@ -13,6 +13,10 @@
   * Updated debian/watch to work with "subreleases" (x.yy_zz)
   * Add myself to Uploaders
   * Convert from dpatch to quilt
+  * Clean up debian/rules
+    + fix inter-target dependencies
+    + unpatch before distclean; touch Makefile to avoid it being rebuilt due
+      to unpatched Makefile.PL
 
  -- Damyan Ivanov <dmn at debian.org>  Sun, 02 Dec 2007 19:03:39 +0200
 

Modified: trunk/libcrypt-rijndael-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libcrypt-rijndael-perl/debian/rules?rev=10728&op=diff
==============================================================================
--- trunk/libcrypt-rijndael-perl/debian/rules (original)
+++ trunk/libcrypt-rijndael-perl/debian/rules Sun Dec  2 17:43:01 2007
@@ -10,14 +10,13 @@
 export PERL_MM_USE_DEFAULT=1
 
 PACKAGE=$(shell dh_listpackages)
+TMP=debian/$(PACKAGE)
 
 include /usr/share/quilt/quilt.make
 
 ifndef PERL
 PERL = /usr/bin/perl
 endif
-
-prefix	:= $(CURDIR)/debian/$(PACKAGE)/usr
 
 CFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -27,26 +26,25 @@
 endif
 
 build: build-stamp
-build-stamp: patch-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	${PERL} Makefile.PL INSTALLDIRS=vendor
-	${MAKE} OPTIMIZE="${CFLAGS}" LD_RUN_PATH=""
-	${MAKE} test
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
+	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
+	$(MAKE) test
 	touch build-stamp
 
-clean: clean-patched unpatch
-clean-patched:
+clean: unpatch
 	dh_testdir
-	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean build-stamp install-stamp
+	[ ! -f Makefile ] || ( touch Makefile && $(MAKE) distclean )
 
-install: build install-stamp
-install-stamp:
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	#dh_clean -k
-	$(MAKE) install PREFIX=$(prefix)
-	rmdir -p --ignore-fail-on-non-empty $(prefix)/share/perl5
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+	rmdir -p --ignore-fail-on-non-empty $(TMP)/usr/share/perl5
 
 binary-indep: build install
 binary-arch: build install