Update ChangeLog file

[nagcollect.git] / Makefile

diff --git a/Makefile b/Makefile
index 3256507564605fd167daa9f361c6fdb953b97a91..5c783c938f0ac69aea90df4b0645104f7872b01d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@
 # Please read the file COPYING, README and AUTHORS for more information.
 #
 
-all:
+all: server client plugins
 
 clean:
        find . -name .DS_Store -delete
@@ -18,12 +18,12 @@ clean:
 distclean: clean
 
 install:
-       @echo " ** Use make targets 'install-client', 'install-server' and 'install-all'"
-       @echo " ** to install client and/or server components!"
+       @echo " ** Use make targets 'install-client', 'install-server', 'install-plugins'"
+       @echo " ** or 'install-all' to install client, server and or plugin components!"
 
-install-all: install-server install-client
+install-all: install-server install-client install-plugins
 
-install-server:
+install-server: server
        install -d -o nagios -g nagios -m 750 /var/lib/nagios3/collect
        [ -r /etc/nagios3/system.cfg ] || \
         install -D -o nagios -g root -m 640 -p \
@@ -40,12 +40,14 @@ install-server:
        [ -r contrib/Makefile.`uname` ] \
                && make -f contrib/Makefile.`uname` "install-server" || true
 
-install-client:
+install-client: client
        install -d -o 0 -g 0 -m 755 /usr/local/sbin
        install -c -o 0 -g 0 -m 755 -p \
                client/bin/nagcollect /usr/local/sbin/nagcollect
        install -c -o 0 -g 0 -m 755 -p \
                client/bin/nagcollectreset /usr/local/sbin/nagcollectreset
+       install -c -o 0 -g 0 -m 755 -p \
+               client/bin/nagcollecttest /usr/local/sbin/nagcollecttest
        install -d -o 0 -g 0 -m 755 /usr/local/etc
        [ -r /usr/local/etc/nagcollect.conf ] || \
         install -o 0 -g 0 -m 600 -p \
@@ -60,6 +62,14 @@ install-client:
        [ -r contrib/Makefile.`uname` ] \
                && make -f contrib/Makefile.`uname` "install-client" || true
 
+install-plugins: plugins
+       install -d -o 0 -g 0 -m 755 /usr/local/lib/nagios/plugins
+       (cd client/lib/nagios/plugins; find . -name 'check_nc_*' | \
+        while read x; do \
+         install -o 0 -g 0 -m 755 "$$x" "/usr/local/lib/nagios/plugins/$$x"; \
+        done \
+       )
+
 check:
 
 dist: distclean
@@ -77,7 +87,7 @@ client:
 
 plugins:
        mkdir -p client/lib/nagios/plugins
-       (cd client/lib/tests; (ls -1 *.tst; ls -1 `uname`/*.tst) | \
+       (cd client/lib/tests; (ls -1 *.tst; ls -1 `uname`/*.tst 2>/dev/null) | \
         while read x; do \
                name="check_nc_`basename "$$x" | cut -d'.' -f1 | tr '[A-Z]' '[a-z]'`"; \
                dest="../nagios/plugins/$$name"; \
@@ -107,6 +117,7 @@ nagcollecttestscripts:
         -C client/lib/tests .
 
 .PHONY: all install install-all install-server install-client \
-       clean distclean check dist distcheck nagcollecttestscripts
+       install-plugins clean distclean check dist distcheck server client \
+       plugins osxpkg osxdmg nagcollecttestscripts
 
 # -eof-