[log4shib] 11/13: Remove the unneded files instead of ignoring them

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi-guest pushed a commit to branch debian/master
in repository log4shib.

commit 04c8101d90b5666247c31ec3952854d20207abae
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Thu Mar 31 14:50:38 2016 +0200

    Remove the unneded files instead of ignoring them
    
    This requires merging the dh_install overrides to enable mixed builds,
    because the documentation gets built and installed in arch builds as well.
    Instead of repeating the cleansing commands, make the removals tolerate
    missing files and directories.
---
 debian/rules | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index e0fbc66..add0459 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,16 +26,15 @@ override_dh_auto_test-indep:
 override_dh_auto_install-indep:
 	$(MAKE) -C doc DESTDIR=$(CURDIR)/debian/tmp install
 
-override_dh_install-arch:
+APIDOCS=debian/tmp/usr/share/doc/log4shib-*/api/html
+override_dh_install:
 	pod2man --release='$(word 3,$(shell ./config.status --version))' \
 	    --section=1 --center=log4shib \
 	    debian/log4shib-config.pod debian/log4shib-config.1
-	rm debian/tmp/usr/lib/*/liblog4shib.la
-	dh_install -Xman3 --fail-missing
-
-override_dh_install-indep:
-	find debian/tmp/usr/share/doc/log4shib-*/api/html -name "*.md5" -delete
-	dh_install -Xman3 --fail-missing
+	rm -f debian/tmp/usr/lib/*/liblog4shib.la
+	rm -rf debian/tmp/usr/share/man/man3
+	if [ -d $(APIDOCS) ]; then find $(APIDOCS) -name "*.md5" -delete; fi
+	dh_install --fail-missing
 
 override_dh_autoreconf:
 	dh_autoreconf --as-needed

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/log4shib.git