Remove OS X packaging scripts

[nagcollect.git] / Makefile

diff --git a/Makefile b/Makefile
index 264532e51e4c9b0034f043eeb98ba6a5977af47c..ba8a06ea1fc77bf693c365c5f48f37db3b0d0bd7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,10 +18,10 @@ 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: server
        install -d -o nagios -g nagios -m 750 /var/lib/nagios3/collect
@@ -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 \
@@ -60,6 +62,14 @@ install-client: 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"; \
@@ -89,24 +99,12 @@ 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 .
 
 .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-