[Pkg-nagios-changes] [pkg-nagios-plugins] 344/413: Fix removing empty /usr/include

[Jan Wagner]

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

waja pushed a commit to branch master
in repository pkg-nagios-plugins.

commit c0bb7868f2d262aaa358bc5a10deb7e40fd4f80c
Author: Jan Wagner <waja at cyconet.org>
Date:   Sun Aug 25 13:30:31 2013 +0000

    Fix removing empty /usr/include
---
 debian/changelog | 1 +
 debian/rules     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2d540b8..aeaec2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ nagios-plugins (1.4.16+git20130823-1) UNRELEASED; urgency=low
     - 10_check_apt_perfdata.dpatch
     - 11_check_nt_npe.dpatch
     - 12_check_smtp_double_threshold.dpatch
+  * Fix removing empty /usr/include
 
  -- Jan Wagner <waja at cyconet.org>  Fri, 23 Aug 2013 22:45:43 +0200
 
diff --git a/debian/rules b/debian/rules
index 214f3c9..0b104bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -182,8 +182,8 @@ install: build
 	mkdir -p ${NP_COMMON_DIR}/usr/share/nagios-plugins/dpkg
 	install -t ${NP_COMMON_DIR}/usr/share/nagios-plugins/dpkg \
 		$(DEBIANDIR)/functions
-	# remove /usr/include from nagios-plugins-nasic (in case its empty)
-	rmdir ${NP_BASIC_DIR}/usr/include
+	# remove /usr/include from nagios-plugins-basic (in case its empty and exists)
+	[ ! -d ${NP_BASIC_DIR}/usr/include ] || rmdir ${NP_BASIC_DIR}/usr/include
 	# generate debian/README.Debian.plugins
 	perl ./debian/bin/gen_plugin_deps.pl
 

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