Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 76018 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-9 / +9 lines)
Line  Link Here
0
-- munin-1.3.2/Makefile.config 2005-04-15 13:29:18.000000000 -0700
0
++ munin-1.3.2-gentoo/Makefile.config  2006-07-09 14:15:59.000000000 -0700
Lines 7-16 Link Here
7
#
7
#
8
# the base of the Munin installation.
8
# the base of the Munin installation.
9
#
9
#
10
PREFIX     = $(DESTDIR)/opt/munin
10
PREFIX     = $(DESTDIR)/usr
11
# Where Munin keeps its configurations (server.conf, client.conf, ++)
11
# Where Munin keeps its configurations (server.conf, client.conf, ++)
12
CONFDIR    = $(DESTDIR)/etc/opt/munin
12
CONFDIR    = $(DESTDIR)/etc/munin
13
# Server only - where to put munin-cron
13
# Server only - where to put munin-cron
14
BINDIR     = $(PREFIX)/bin
14
BINDIR     = $(PREFIX)/bin
Lines 19-38 Link Here
19
SBINDIR    = $(PREFIX)/sbin
19
SBINDIR    = $(PREFIX)/sbin
20
# Where to put text and html documentation
20
# Where to put text and html documentation
21
DOCDIR     = $(PREFIX)/doc
21
DOCDIR     = $(PREFIX)/share/doc/munin-$(VERSION)
22
# Where to put man pages
22
# Where to put man pages
23
MANDIR     = $(PREFIX)/man
23
MANDIR     = $(PREFIX)/share/man
24
# Where to put internal binaries and plugin repository
24
# Where to put internal binaries and plugin repository
25
LIBDIR     = $(PREFIX)/lib
25
LIBDIR     = $(PREFIX)/lib
26
# Server only - Output directory
26
# Server only - Output directory
27
HTMLDIR    = $(PREFIX)/var/www
27
HTMLDIR    = $(DESTDIR)/var/www/localhost/htdocs/
28
CGIDIR     = $(HTMLDIR)/cgi
28
CGIDIR     = $(HTMLDIR)/cgi
29
# Client only - Where to put RRD files and other intenal data
29
# Client only - Where to put RRD files and other intenal data
30
DBDIR      = $(DESTDIR)/var/opt/munin
30
DBDIR      = $(DESTDIR)/var/lib/munin
31
# Client only - Where plugins should put their states. Must be writable by
31
# Client only - Where plugins should put their states. Must be writable by
32
# group "munin", and should be preserved between reboots
32
# group "munin", and should be preserved between reboots
Lines 65-72 Link Here
65
VERSION    = $(shell cat RELEASE)
65
VERSION    = $(shell cat RELEASE)
66
# User to run munin as
66
# User to run munin as
67
USER       = munin
67
USER       = root
68
GROUP      = munin
68
GROUP      = wheel
69
# Default user to run the plugins as
69
# Default user to run the plugins as
70
PLUGINUSER = nobody
70
PLUGINUSER = nobody

Return to bug 76018