--- munin-1.3.2/Makefile~	2005-04-15 22:37:29.000000000 +0200
+++ munin-1.3.2/Makefile	2005-10-06 18:50:39.096579400 +0200
@@ -20,6 +20,7 @@
 	mkdir -p $(CONFDIR)/templates
 	mkdir -p $(LIBDIR)
 	mkdir -p $(BINDIR)
+	mkdir -p $(SBINDIR)
 	mkdir -p $(PERLLIB)
 
 	mkdir -p $(LOGDIR)
@@ -39,7 +40,7 @@
 
 	test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/
 
-	$(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/
+	$(INSTALL) -m 0755 build/server/munin-cron $(SBINDIR)/
 
 	$(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/
 	$(INSTALL) -m 0755 build/server/munin-graph $(LIBDIR)/
--- munin-1.3.2/Makefile.config.orig	2005-10-07 10:47:48.254572336 +0200
+++ munin-1.3.2/Makefile.config	2005-10-07 11:00:44.459571240 +0200
@@ -7,10 +7,10 @@
 #
 # the base of the Munin installation.
 # 
-PREFIX     = $(DESTDIR)/opt/munin
+PREFIX     = $(DESTDIR)/usr
 
 # Where Munin keeps its configurations (server.conf, client.conf, ++)
-CONFDIR    = $(DESTDIR)/etc/opt/munin
+CONFDIR    = $(DESTDIR)/etc/munin
 
 # Server only - where to put munin-cron
 BINDIR     = $(PREFIX)/bin
@@ -22,17 +22,17 @@
 DOCDIR     = $(PREFIX)/doc
 
 # Where to put man pages
-MANDIR     = $(PREFIX)/man
+MANDIR     = $(PREFIX)/share/man
 
 # Where to put internal binaries and plugin repository
-LIBDIR     = $(PREFIX)/lib
+LIBDIR     = $(PREFIX)/share/munin
 
 # Server only - Output directory
-HTMLDIR    = $(PREFIX)/var/www
-CGIDIR     = $(HTMLDIR)/cgi
+HTMLDIR    = $(DESTDIR)/home/services/httpd/html/munin
+CGIDIR     = $(LIBDIR)/cgi
 
 # Client only - Where to put RRD files and other intenal data
-DBDIR      = $(DESTDIR)/var/opt/munin
+DBDIR      = $(DESTDIR)/var/lib/munin
 
 # Client only - Where plugins should put their states. Must be writable by
 # group "munin", and should be preserved between reboots
@@ -52,14 +52,14 @@
 PYTHON     = /usr/bin/env python
 
 # Server only - Where to install the perl libraries
-PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g")
+PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:vendorlib | cut -d= -f2 | sed "s/[\';]//g")
 
 # Client only - Install plugins for this architecture
 OSTYPE     = $(shell uname | tr '[A-Z]' '[a-z]')
 
 # How to figure out the hostname. (Only used in default configuration
 # files)
-HOSTNAME   = $(shell hostname)
+HOSTNAME   = localhost
 
 # Munin version number.
 VERSION    = $(shell cat RELEASE)
@@ -72,10 +72,10 @@
 PLUGINUSER = nobody
 
 # Which command to use to check if the USER and GROUP to run Munin as, exists.
-GETENT = $(shell which getent || which true 2>/dev/null)
-CHECKUSER  = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
-CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
-
-CHOWN      = chown
-CHMOD      = chmod
-CHGRP      = chgrp
+GETENT = /bin/true
+CHECKUSER  = /bin/true
+CHECKGROUP = /bin/true
+
+CHOWN      = /bin/true
+CHMOD      = /bin/true
+CHGRP      = /bin/true