r12667 - in /trunk/libdevel-caller-perl/debian: changelog rules

[ntyni at users.alioth.debian.org]

Author: ntyni
Date: Sun Jan 13 20:12:50 2008
New Revision: 12667

URL: http://svn.debian.org/wsvn/?sc=1&rev=12667
Log:
* Don't set INSTALLVENDORLIB etc., conditionally remove the empty
  usr/share/perl5 directory instead.

Modified:
    trunk/libdevel-caller-perl/debian/changelog
    trunk/libdevel-caller-perl/debian/rules

Modified: trunk/libdevel-caller-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libdevel-caller-perl/debian/changelog?rev=12667&op=diff
==============================================================================
--- trunk/libdevel-caller-perl/debian/changelog (original)
+++ trunk/libdevel-caller-perl/debian/changelog Sun Jan 13 20:12:50 2008
@@ -8,6 +8,8 @@
   [ Niko Tyni ]
   * Update debian/copyright.
   * No need to remove upstream MacOS resource forks in debian/rules anymore.
+  * Don't set INSTALLVENDORLIB etc., conditionally remove the empty 
+    usr/share/perl5 directory instead.
 
  -- Jose Luis Rivas <ghostbar38 at gmail.com>  Sun, 13 Jan 2008 14:49:22 -0430
 

Modified: trunk/libdevel-caller-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libdevel-caller-perl/debian/rules?rev=12667&op=diff
==============================================================================
--- trunk/libdevel-caller-perl/debian/rules (original)
+++ trunk/libdevel-caller-perl/debian/rules Sun Jan 13 20:12:50 2008
@@ -31,10 +31,7 @@
 build: build-stamp
 build-stamp:
 	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor \
-		INSTALLVENDORARCH=/usr/lib/perl5/ \
-		INSTALLVENDORLIB=/usr/lib/perl5/ \
-		VENDORARCHEXP=/usr/lib/perl5/
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
 	$(MAKE) test
 	touch $@
@@ -51,6 +48,8 @@
 	dh_testroot
 	dh_clean -k
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+	[ ! -d $(TMP)/usr/share/perl5/ ] || \
+		rmdir --verbose --parents --ignore-fail-on-non-empty $(TMP)/usr/share/perl5/
 	touch $@
 
 # Build architecture-independent files here.