X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=nagcollect.git;a=blobdiff_plain;f=Makefile;h=47bbf448eaeba0291978cc51bb6d093202c15396;hp=3256507564605fd167daa9f361c6fdb953b97a91;hb=b29552015c28f4742f715989ee498876ce621992;hpb=cf53e28a0e46668ec488ad079ef9bf5e07bc9b13

diff --git a/Makefile b/Makefile
index 3256507..47bbf44 100644
--- 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,7 +40,7 @@ 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
@@ -60,6 +60,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 +85,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 +115,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-