X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fnagios;h=1a88989d7ccb074ac910c696f3d2c736706406e7;hb=b33e050763f5c752aadedc62c4da75f3392aca25;hp=a9cef536f750de9f8ff53ed4ca5a15056013a9e0;hpb=34daf4dbf8e4e5e4fb901f8dcece703480a1ac1f;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/nagios b/lfs/nagios
index a9cef536f7..1a88989d7c 100644
--- a/lfs/nagios
+++ b/lfs/nagios
@@ -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)