diff options
author | Karl DeBisschop <kdebisschop@users.sourceforge.net> | 2002-10-25 02:31:03 +0000 |
---|---|---|
committer | Karl DeBisschop <kdebisschop@users.sourceforge.net> | 2002-10-25 02:31:03 +0000 |
commit | 898da8c89aea9f1dd55f4a569799d9daa51407d1 (patch) | |
tree | ccdf1a888db1f2bcbe391066896a4a6526618bb4 | |
parent | 6361f796172f240f5ecb2c21a60511634bbc6d47 (diff) | |
download | monitoring-plugins-898da8c89aea9f1dd55f4a569799d9daa51407d1.tar.gz |
include getloadavg sources, add some Solaris pkg build support
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@158 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r-- | Makefile.am | 32 | ||||
-rw-r--r-- | plugins/Makefile.am | 3 |
2 files changed, 33 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index af0e86e9..9e0415e1 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -3,7 +3,7 @@ | |||
3 | SUBDIRS = plugins plugins-scripts | 3 | SUBDIRS = plugins plugins-scripts |
4 | 4 | ||
5 | EXTRA_DIST = REQUIREMENTS acconfig.h subst.in subst.sh Helper.pm \ | 5 | EXTRA_DIST = REQUIREMENTS acconfig.h subst.in subst.sh Helper.pm \ |
6 | contrib nagios-plugins.spec.in | 6 | contrib nagios-plugins.spec.in getloadavg.m4 |
7 | 7 | ||
8 | dist-hook: | 8 | dist-hook: |
9 | sed "s/PACKAGE_VERSION/@PACKAGE_VERSION@/;s/PACKAGE_RELEASE/@PACKAGE_RELEASE@/;" $(srcdir)/nagios-plugins.spec.in > $(distdir)/nagios-plugins.spec | 9 | sed "s/PACKAGE_VERSION/@PACKAGE_VERSION@/;s/PACKAGE_RELEASE/@PACKAGE_RELEASE@/;" $(srcdir)/nagios-plugins.spec.in > $(distdir)/nagios-plugins.spec |
@@ -11,3 +11,33 @@ dist-hook: | |||
11 | test: | 11 | test: |
12 | cd plugins; $(MAKE) test | 12 | cd plugins; $(MAKE) test |
13 | cd plugins-scripts; $(MAKE) test | 13 | cd plugins-scripts; $(MAKE) test |
14 | |||
15 | # Solaris pkgmk | ||
16 | PACKDIR=build-pkg | ||
17 | VERSION=@PACKAGE_VERSION@ | ||
18 | |||
19 | Prototype: | ||
20 | if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi | ||
21 | cd build-solaris | ||
22 | $(MAKE) all | ||
23 | $(MAKE) DESTDIR=../$(PACKDIR) install | ||
24 | cd .. | ||
25 | echo i pkginfo> Prototype | ||
26 | if [ -f checkinstall ] ; then echo i checkinstall>> Prototype; fi | ||
27 | if [ -f preinstall ] ; then echo i preinstall>> Prototype; fi | ||
28 | if [ -f postinstall ] ; then echo i postinstall>> Prototype; fi | ||
29 | pkgproto $(PACKDIR)=/ | sed -e "s|$(LOGNAME) $(GROUP)$$|root root|" | egrep -v "(s|d) none (/|/etc|/var|/usr|/usr/local) " >> Prototype | ||
30 | |||
31 | pkgmap: ../Prototype | ||
32 | mkdir -p $(PACKDIR)/nagiosp | ||
33 | cd $(PACKDIR)/nagiosp | ||
34 | pkgmk -o -r / -f ../Prototype -d $(PACKDIR) nagiosp | ||
35 | cd .. | ||
36 | |||
37 | nagios.SPARC.pkg.tar.gz: pkgmap | ||
38 | cd $(PACKDIR) && tar -cf - nagiosp | gzip -9 -c > ../nagiosp.SPARC.pkg.tar.gz | ||
39 | |||
40 | pkgset: nagiosp.SPARC.pkg.tar.gz | ||
41 | |||
42 | pkgclean: | ||
43 | rm -rf Prototype nagiosp.SPARC.pkg.tar.gz | ||
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 420ed059..95258ed7 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am | |||
@@ -15,7 +15,8 @@ EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \ | |||
15 | check_swap check_fping check_ldap check_game check_dig \ | 15 | check_swap check_fping check_ldap check_game check_dig \ |
16 | check_nagios check_by_ssh check_dns check_nt | 16 | check_nagios check_by_ssh check_dns check_nt |
17 | 17 | ||
18 | EXTRA_DIST = t utils.c netutils.c popen.c getopt.h getopt.c getopt1.c snprintf.c | 18 | EXTRA_DIST = t utils.c netutils.c popen.c getopt.h getopt.c getopt1.c \ |
19 | snprintf.c getloadavg.c | ||
19 | 20 | ||
20 | PLUGINHDRS = common.h config.h | 21 | PLUGINHDRS = common.h config.h |
21 | 22 | ||