DiskErrors.tst: dont't assume "encoder error" as disk I/O error

[nagcollect.git] / Makefile

diff --git a/Makefile b/Makefile
index aef74d5b7fa2c170c26faf0461e8e63b2e4bd2e0..ef19ad4bb63a68d53f99b8bf2673378e99a080d3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,12 @@
 #
 # NagCollect -- Nagios Data Collector for Passive Checks
-# Copyright (c)2009 Alexander Barton, alex@barton.de
+# Copyright (c)2009-2010 Alexander Barton, alex@barton.de
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# Please read the file COPYING, README and AUTHORS for more information.
 #
 
 all:
@@ -37,6 +43,8 @@ install-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 -d -o 0 -g 0 -m 755 /usr/local/etc
        [ -r /usr/local/etc/nagcollect.conf ] || \
         install -o 0 -g 0 -m 600 -p \
@@ -54,14 +62,30 @@ install-client:
 check:
 
 dist: distclean
-       dir=`basename $${PWD}` \
+       rel=`grep "^NagCollect " ChangeLog|awk "{print \\\$$3 }"|head -n 1`; \
+        dir=`basename $${PWD}` \
         && cd .. \
-        && tar cvzf "$${dir}.tar.gz" --exclude .git "$${dir}"
+        && COPYFILE_DISABLE=true tar cvzf "NagCollect-R$${rel}.tar.gz" \
+            --exclude .git "$${dir}"
 
 distcheck: check dist
 
+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:
-       tar -czvf nagcollecttestscripts.tgz -C client/lib/tests .
+       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