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

diff --git a/lfs/nagios b/lfs/nagios
index c2affea31a..5ff1499a85 100644
--- a/lfs/nagios
+++ b/lfs/nagios
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios
-PAK_VER    = 2
+PAK_VER    = 3
 
-DEPS       = "traceroute libtool"
+DEPS       = "traceroute"
 
 ###############################################################################
 # Top-level Rules
@@ -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,15 +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
-	cd $(DIR_SRC)/nagios-plugins* && make $(MAKETUNING)
+		--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)
-
-
-