[patch] re-revised Makefile.config patch: Also install into vendor_perl, not site_perl

munin-1.4.3-Makefile.patch (text/plain), 2.47 KB, created by Jeroen Roovers (RETIRED) on 2010-01-18 18:45:13 UTC

--- munin-1.4.3/Makefile.config.org	2009-12-30 13:55:56.000000000 +0100
+++ munin-1.4.3/Makefile.config	2010-01-18 19:34:37.000000000 +0100
@@ -17,10 +17,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
@@ -29,37 +29,37 @@
 SBINDIR    = $(PREFIX)/sbin
 
 # Where to put text and html documentation
-DOCDIR     = $(PREFIX)/doc
+DOCDIR     = $(PREFIX)/share/doc/munin-$(VERSION)
 
 # 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)/libexec/munin
 
 # Server only - Output directory
-HTMLDIR    = $(PREFIX)/www/docs
-CGIDIR     = $(PREFIX)/www/cgi
+HTMLDIR    = $(PREFIX)/var/www/localhost/htdocs/munin
+CGIDIR     = $(PREFIX)/var/www/localhost/cgi-bin
 
 # 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
+SSPOOLDIR  = $(DESTDIR)/var/run/munin/spool
 
 # Suggested directory name for a pulic ramdisk based tmp directory.
 # SSPOOLDIR := /tmp/muninspool
 
 # 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
 PLUGSTATE  = $(DBDIR)/plugin-state
 
 # Where Munin should place its logs.
-LOGDIR     = $(PREFIX)/log/munin
+LOGDIR     = $(DESTDIR)/var/log/munin
 
 # Location of PID files and other statefiles. On the server, must be
 # writable by the user "munin".
@@ -98,11 +98,11 @@
 BASH       := /bin/bash
 
 # Server only - Where to install the perl libraries
-PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
+PERLSITELIB := $(shell $(PERL) -V:vendorlib | cut -d"'" -f2)
 PERLLIB    = $(DESTDIR)$(PERLSITELIB)
 
 # Client only - Install plugins for this architecture
-OSTYPE     := $(shell uname | tr '[A-Z]' '[a-z]')
+OSTYPE     := $(shell uname | LANG=C tr '[A-Z]' '[a-z]')
 
 # How to figure out the hostname. (Only used in default configuration
 # files)