* Handle a non-existent /usr/lib/perl5 properly (for perl 5.10)

diff --git a/debian/changelog b/debian/changelog
index 9387d790d2bc670ab54b2737006a09aa5d45c3bd..7dcca9ef3b9fc68dfc42e29063452ebb1185e955 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libhtml-calendarmonth-perl (1.18-4) unstable; urgency=low
+
+  * Handle a non-existent /usr/lib/perl5 properly (for perl 5.10)
+
+ -- Don Armstrong <don@debian.org>  Wed, 16 Jan 2008 15:10:39 -0800
+
 libhtml-calendarmonth-perl (1.18-3) unstable; urgency=low
 
   * Disable the 20_i18n test of the basque locale which has been broken by

diff --git a/debian/rules b/debian/rules
index 13b11fe485377aff701d69c014ee5f8f2cbc5f3c..5b5956a3ba3c55c644ddfdd3dc154b0b85ce138a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,8 @@ install: build test
        dh_installdirs
 
        $(MAKE) install PREFIX=$(DESTDIR)/usr
-       rmdir -p $(DESTDIR)/usr/lib/perl5 || true
+       [ ! -d $(DESTDIR)/usr/lib/perl5 ] || \
+               rmdir -p --ignore-fail-on-non-empty$(DESTDIR)/usr/lib/perl5
 
 # Build architecture-independent files here.
 binary-indep: install