diff -ur a/Makefile.config b/Makefile.config --- a/Makefile.config 2018-08-06 16:23:55.119755310 +0200 +++ b/Makefile.config 2018-08-06 16:26:23.252875870 +0200 @@ -17,35 +17,35 @@ # # the base of the Munin installation. # -PREFIX = $(DESTDIR)/opt/munin +PREFIX = $(DESTDIR) # 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 +BINDIR = $(PREFIX)/usr/bin # Client only - where to put munin-node, munin-node-configure, and munin-run -SBINDIR = $(PREFIX)/sbin +SBINDIR = $(PREFIX)/usr/sbin # Where to put text and html documentation -DOCDIR = $(PREFIX)/doc +DOCDIR = $(PREFIX)/usr/share/doc/munin # Where to put man pages -MANDIR = $(PREFIX)/man +MANDIR = $(PREFIX)/usr/share/man # Where to put internal binaries and plugin repository -LIBDIR = $(PREFIX)/lib +LIBDIR = $(PREFIX)/usr/lib/munin # Server only - Output directory -HTMLDIR = $(PREFIX)/www/docs -CGIDIR = $(PREFIX)/www/cgi +HTMLDIR = $(PREFIX)/usr/share/webapps/munin/html +CGIDIR = $(PREFIX)/usr/share/webapps/munin/cgi # Where to put internal data for master (RRD, internal files, ...) -DBDIR = $(DESTDIR)/var/opt/munin +DBDIR = $(DESTDIR)/var/lib/munin # Where to put internal data for node (plugin state, ...) -DBDIRNODE = $(DESTDIR)/var/opt/munin-node +DBDIRNODE = $(DESTDIR)/var/lib/munin-node # Client only - Where the spool files are written. Must be writable by # group "munin", and should be preserved between reboots @@ -56,14 +56,14 @@ PLUGSTATE = $(DBDIRNODE)/plugin-state # Where Munin should place its logs. -LOGDIR = $(PREFIX)/log/munin +LOGDIR = $(PREFIX)/var/log/munin # Location of PID files and other statefiles. On the server, must be # writable by the user "munin". -STATEDIR = $(DESTDIR)/var/run/munin +STATEDIR = $(DESTDIR)/run/munin # The perl interpreter to use -PERL := $(shell which perl) +PERL := /usr/bin/perl # The python interpreter to use (used by some plugins) PYTHON := /usr/bin/env python3 @@ -89,13 +89,13 @@ # On Linux /bin/sh, SunOS/Solaris /usr/xpg4/bin/sh or /bin/ksh # In general: bash or ksh will work # -GOODSH := $(shell PATH=`getconf PATH 2>/dev/null || echo $(PATH)` LANG=C sh -c 'type sh | sed "s/.* //"') +GOODSH := /bin/sh # Path of bash for bash specific plugins BASH := /bin/bash # Server only - Where to install the perl libraries -PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2) +PERLLIB = $(DESTDIR)$(shell $(PERL) -V:vendorlib | cut -d"'" -f2) # Client only - Install plugins for this architecture # the LANG=C makes tr work as expected, not regarding any locale it