1 --- munin-1.4.0/Makefile~ 2009-11-27 12:17:18.000000000 +0100
2 +++ munin-1.4.0/Makefile 2009-11-30 14:33:15.977700738 +0100
4 mkdir -p $(CONFDIR)/munin-conf.d
9 mkdir -p $(PERLLIB)/Munin/Master
12 test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
13 test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
15 - $(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/
16 - $(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/
17 + $(INSTALL) -m 0755 build/master/_bin/munin-cron $(SBINDIR)/
18 + $(INSTALL) -m 0755 build/master/_bin/munin-check $(LIBDIR)/
19 $(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/
20 $(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/
21 $(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/
22 --- munin-1.4.0/Makefile.config~ 2009-11-27 12:17:18.000000000 +0100
23 +++ munin-1.4.0/Makefile.config 2009-11-30 14:32:28.827763277 +0100
26 # the base of the Munin installation.
28 -PREFIX = $(DESTDIR)/opt/munin
29 +PREFIX = $(DESTDIR)/usr
31 # Where Munin keeps its configurations (server.conf, client.conf, ++)
32 -CONFDIR = $(DESTDIR)/etc/opt/munin
33 +CONFDIR = $(DESTDIR)/etc/munin
35 # Server only - where to put munin-cron
36 BINDIR = $(PREFIX)/bin
38 DOCDIR = $(PREFIX)/doc
40 # Where to put man pages
41 -MANDIR = $(PREFIX)/man
42 +MANDIR = $(PREFIX)/share/man
44 # Where to put internal binaries and plugin repository
45 -LIBDIR = $(PREFIX)/lib
46 +LIBDIR = $(PREFIX)/share/munin
48 # Server only - Output directory
49 -HTMLDIR = $(PREFIX)/www/docs
50 -CGIDIR = $(PREFIX)/www/cgi
51 +HTMLDIR = $(DESTDIR)/var/lib/munin/html
52 +CGIDIR = $(LIBDIR)/cgi
54 # Where to put internal data for master (RRD, internal files, ...)
55 -DBDIR = $(DESTDIR)/var/opt/munin
56 +DBDIR = $(DESTDIR)/var/lib/munin/db
58 # Where to put internal data for node (plugin state, ...)
59 -DBDIRNODE = $(DESTDIR)/var/opt/munin-node
60 +DBDIRNODE = $(DESTDIR)/var/lib/munin/db-node
62 # Client only - Where the spool files are written. Must be writable by
63 # group "munin", and should be preserved between reboots
64 -SPOOLDIR = $(DBDIR)/spool
65 +SPOOLDIR = $(DESTDIR)/var/spool/munin
67 # Client only - Where plugins should put their states. Must be writable by
68 # group "munin", and should be preserved between reboots
69 -PLUGSTATE = $(DBDIRNODE)/plugin-state
70 +PLUGSTATE = $(DESTDIR)/var/lib/munin/plugin-state
72 # Where Munin should place its logs.
73 -LOGDIR = $(PREFIX)/log/munin
74 +LOGDIR = $(DESTDIR)/var/log/munin
76 # Location of PID files and other statefiles. On the server, must be
77 # writable by the user "munin".
81 # Server only - Where to install the perl libraries
82 -PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
83 +PERLSITELIB := $(shell $(PERL) -V:vendorlib | cut -d"'" -f2)
84 PERLLIB = $(DESTDIR)$(PERLSITELIB)
86 # Client only - Install plugins for this architecture
89 # How to figure out the hostname. (Only used in default configuration
91 -HOSTNAME := $(shell hostname)
92 +HOSTNAME := localhost
94 # What is the safest way to create a tempfile.
95 # Default is to figure it out by testing various methods.
97 # Which command to use to check if the USER and GROUP to run Munin as, exists.
98 # These will work on most modern OSes:
100 -GETENT := $(shell which getent || which true 2>/dev/null)
101 -CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
102 -CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
104 +CHECKUSER := /bin/true
105 +CHECKGROUP := /bin/true
107 # For OSX, comment out the previous two lines and comment in these
110 #CHECKUSER := $(shell pwget -n $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
111 #CHECKGROUP := $(shell grget -n $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
120 # Java compiler stuff - only needed on the buildhost