[Pkg-nagios-changes] [pkg-nagios] r2108 - nagios-plugins/trunk/debian

[Jan Wagner]

Author: waja
Date: 2013-08-25 13:30:31 +0000 (Sun, 25 Aug 2013)
New Revision: 2108

Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/rules
Log:
Fix removing empty /usr/include

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2013-08-25 13:29:53 UTC (rev 2107)
+++ nagios-plugins/trunk/debian/changelog	2013-08-25 13:30:31 UTC (rev 2108)
@@ -6,6 +6,7 @@
     - 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
 

Modified: nagios-plugins/trunk/debian/rules
===================================================================
--- nagios-plugins/trunk/debian/rules	2013-08-25 13:29:53 UTC (rev 2107)
+++ nagios-plugins/trunk/debian/rules	2013-08-25 13:30:31 UTC (rev 2108)
@@ -182,8 +182,8 @@
 	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