Merge branch 'master' into next

[ipfire-2.x.git] / lfs / nagios

diff --git a/lfs/nagios b/lfs/nagios
index 2bb2a41efdf6bd451c26618c779e40377ca79e44..1a88989d7ccb074ac910c696f3d2c736706406e7 100644 (file)
--- 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
-       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)