r12276 - in /trunk/libparent-perl/debian: changelog rules

[dmn at users.alioth.debian.org]

Author: dmn
Date: Wed Jan  9 12:04:18 2008
New Revision: 12276

URL: http://svn.debian.org/wsvn/?sc=1&rev=12276
Log:
* debian/rules:
  + stop passing detailed directories to $(PERL) Makefile.PL
  + remove usr/lib/perl5 if it is installed by MakeMaker

Modified:
    trunk/libparent-perl/debian/changelog
    trunk/libparent-perl/debian/rules

Modified: trunk/libparent-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libparent-perl/debian/changelog?rev=12276&op=diff
==============================================================================
--- trunk/libparent-perl/debian/changelog (original)
+++ trunk/libparent-perl/debian/changelog Wed Jan  9 12:04:18 2008
@@ -13,6 +13,9 @@
 
   [ Damyan Ivanov ]
   * debian/watch: add v? to filename pattern
+  * debian/rules:
+    + stop passing detailed directories to $(PERL) Makefile.PL
+    + remove usr/lib/perl5 if it is installed by MakeMaker
 
  -- David Paleino <d.paleino at gmail.com>  Thu, 03 Jan 2008 00:20:38 +0100
 

Modified: trunk/libparent-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libparent-perl/debian/rules?rev=12276&op=diff
==============================================================================
--- trunk/libparent-perl/debian/rules (original)
+++ trunk/libparent-perl/debian/rules Wed Jan  9 12:04:18 2008
@@ -25,9 +25,7 @@
 build-stamp: patch
 	dh_testdir
 
-	$(PERL) Makefile.PL INSTALLDIRS=vendor \
-		INSTALLVENDORARCH=/usr/share/perl5/ \
-		VENDORARCHEXP=/usr/share/perl5/
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
 	$(MAKE) test
 
@@ -48,6 +46,9 @@
 	dh_clean -k
 
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+	[ ! -d $(TMP)/usr/lib/perl5 ] \
+	    || rmdir --parent --verbose --ignore-fail-on-non-empty \
+	    	$(TMP)/usr/lib/perl5
 
 	touch $@
 
@@ -55,7 +56,7 @@
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs 
+	dh_installdocs
 	dh_installchangelogs Changes
 	dh_perl
 	dh_compress