X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fnagios;h=5ff1499a85cfcbd8704bc740d3d7ccaa01c8c776;hp=a9cef536f750de9f8ff53ed4ca5a15056013a9e0;hb=ad1204e4eb397b4f7d10c3bdfa9214aa8c0a0575;hpb=0fc392d65d513df573573dec57ccf06af2c29a9f

diff --git a/lfs/nagios b/lfs/nagios
index a9cef536f7..5ff1499a85 100644
--- a/lfs/nagios
+++ b/lfs/nagios
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = "traceroute"
 
@@ -79,7 +79,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) $(DIR_SRC)/nagios-plugins* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && \
 		./configure --prefix=/usr \
 			--sysconfdir=/etc/nagios \
@@ -102,12 +102,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_SRC) && tar xfz $(DIR_DL)/nagios-plugins-1.4.13.tar.gz
 	cd $(DIR_SRC)/nagios-plugins* && ./configure --prefix=/usr \
 		--libexecdir=/usr/lib/nagios \
-		--with-nagios-user=nobody --with-nagios-group=nobody
+		--with-nagios-user=nobody --with-nagios-group=nobody \
+		--without-ipv6
 	cd $(DIR_SRC)/nagios-plugins* && make
 	cd $(DIR_SRC)/nagios-plugins* && make install
 	chown -R nobody:nobody /var/nagios
 	ln -s /etc/init.d/nagios /etc/rc.d/rc3.d/S67nagios
 	ln -s /etc/init.d/nagios /etc/rc.d/rc0.d/K33nagios
 	ln -s /etc/init.d/nagios /etc/rc.d/rc6.d/K33nagios
-	@rm -rf $(DIR_APP)
+	@rm -rf $(DIR_APP) $(DIR_SRC)/nagios-plugins*
 	@$(POSTBUILD)