X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=nagcollect.git;a=blobdiff_plain;f=Makefile;h=ba8a06ea1fc77bf693c365c5f48f37db3b0d0bd7;hp=ba9bd211da4e64cd58e2e0f9daddbb96cd6d3b4d;hb=HEAD;hpb=7b25d943d4339ad8310a75806761103cb2399898

diff --git a/Makefile b/Makefile
index ba9bd21..ba8a06e 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ clean:
 distclean: clean
 
 install:
-	@echo " ** Use make targets 'install-client', 'install-server', 'install-plugins'
+	@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-plugins
@@ -46,6 +46,8 @@ install-client: client
 		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 \
@@ -85,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"; \
@@ -97,19 +99,6 @@ plugins:
 	 done \
 	)
 
-osxpkg:
-	rel=`grep "^NagCollect " ChangeLog|awk "{print \\\$$3 }"|head -n 1`; \
-	 rm -rf "../NagCollect-R$${rel}.mpkg" \
-	 && packagemaker \
-	     --doc "contrib/NagCollect.pmdoc" \
-	     --out "../NagCollect-R$${rel}.mpkg"
-
-osxdmg: osxpkg
-	rel=`grep "^NagCollect " ChangeLog|awk "{print \\\$$3 }"|head -n 1`; \
-	 rm -f "../NagCollect-R$${rel}.dmg" \
-	 && hdiutil create -srcfolder \
-	     "../NagCollect-R$${rel}.mpkg" "../NagCollect-R$${rel}.dmg"
-
 nagcollecttestscripts:
 	COPYFILE_DISABLE=true tar -czvf nagcollecttestscripts.tgz \
 	 -C client/lib/tests .