Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Makefiles: remove SSPOOLDIR, a remnant of munin-gather

munin-gather was removed in r4275.
  • Loading branch information...
commit c846e0e4309a3bcc482002944230db097a5ed067 1 parent 3bcee0e
@kenyon kenyon authored
Showing with 5 additions and 19 deletions.
  1. +1 −3 Makefile
  2. +4 −14 Makefile.config
  3. +0 −2  Makefile.config-maint
View
4 Makefile
@@ -233,7 +233,6 @@ build/%: %.in
-e 's|@@GOODSH@@|$(GOODSH)|g' \
-e 's|@@BASH@@|$(BASH)|g' \
-e 's|@@HASSETR@@|$(HASSETR)|g' \
- -e 's|@@SSPOOLDIR@@|$(SSPOOLDIR)|g' \
$< > $@;
@@ -271,8 +270,7 @@ common/blib/lib/Munin/Common/Defaults.pm: common/lib/Munin/Common/Defaults.pm bu
s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \
s{(GOODSH \s+=\s).*}{\1q{$(GOODSH)};}x; \
s{(BASH \s+=\s).*}{\1q{$(BASH)};}x; \
- s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x; \
- s{(SSPOOLDIR \s+=\s).*}{\1q{$(SSPOOLDIR)};}x;' \
+ s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x;' \
$< > $@
build-doc: build-doc-stamp Makefile Makefile.config
View
18 Makefile.config
@@ -6,7 +6,7 @@
# run 'make' in the source directory. Modify it to suit your needs.
# DESTDIR is meant only for use when making Munin packages. Unless
-# you're doing packaging do NOT set it.
+# you're doing packaging do NOT set it.
# DESTDIR is empty during building, and optionally set to point to
# a shadow tree during make install.
@@ -16,7 +16,7 @@
#
# the base of the Munin installation.
-#
+#
PREFIX = $(DESTDIR)/opt/munin
# Where Munin keeps its configurations (server.conf, client.conf, ++)
@@ -41,16 +41,6 @@ LIBDIR = $(PREFIX)/lib
HTMLDIR = $(PREFIX)/www/docs
CGIDIR = $(PREFIX)/www/cgi
-# Server only - spool directory for data gathered from nodes by
-# munin-gather - experimental. Place on ramdisk to make munin
-# scale better. On many versions of Linux as well as on Solaris
-# /tmp will be a ramdisk.
-
-SSPOOLDIR = $(PREFIX)/spool
-
-# Suggested directory name for a pulic ramdisk based tmp directory.
-# SSPOOLDIR := /tmp/muninspool
-
# Where to put RRD files and other internal data, both master and node
DBDIR = $(DESTDIR)/var/opt/munin
@@ -82,7 +72,7 @@ RUBY := /usr/bin/env ruby
JAVARUN := /usr/bin/java
# The java library dir to use (used by some plugins)
-# this is needed in order to be able to install
+# this is needed in order to be able to install
# java libraries in a custom location. Many distrubutions
# enforce a spesific location for java libraries.
JAVALIBDIR:= $(LIBDIR)
@@ -92,7 +82,7 @@ JAVALIBDIR:= $(LIBDIR)
# other modern stuff is expected. On a posix-system the expression
# below will find the right shell. Most Unixes released the last 10
# years are POSIX compliant enough for this to work (he said bravely).
-#
+#
# On Linux /bin/sh, SunOS/Solaris /usr/xpg4/bin/sh or /bin/ksh
# In general: bash or ksh will work
#
View
2  Makefile.config-maint
@@ -25,8 +25,6 @@ PREFIX = $(DESTDIR)/usr
CONFDIR = $(DESTDIR)/etc/munin
DOCDIR = $(PREFIX)/share/doc/munin
MANDIR = $(PREFIX)/share/man
-SSPOOLDIR = /tmp/muninspool
-
# Where to put internal binaries and plugin repository
LIBDIR = $(PREFIX)/share/munin
Please sign in to comment.
Something went wrong with that request. Please try again.