Attachment #149556 for bug #214152




# This removes the installed config so that the next install-pass installs
# a new config.  Target suitable for maintainers
unconfig:
	rm -f $(DESTDIR)$(HTMLDIR)/.htaccess
	rm -f $(DESTDIR)$(CONFDIR)/munin.conf

install-main: build
	$(CHECKUSER)
	mkdir -p $(DESTDIR)$(CONFDIR)/templates
	mkdir -p $(DESTDIR)$(LIBDIR)
	mkdir -p $(DESTDIR)$(BINDIR)
	mkdir -p $(DESTDIR)$(PERLLIB)

	mkdir -p $(DESTDIR)$(LOGDIR)
	mkdir -p $(DESTDIR)$(STATEDIR)
	mkdir -p $(DESTDIR)$(HTMLDIR)
	mkdir -p $(DESTDIR)$(DBDIR)
	mkdir -p $(DESTDIR)$(CGIDIR)

	$(CHOWN) $(USER) $(DESTDIR)$(LOGDIR) $(DESTDIR)$(STATEDIR) $(DESTDIR)$(RUNDIR) $(DESTDIR)$(HTMLDIR) $(DESTDIR)$(DBDIR)

	for p in build/server/*.tmpl; do    		         \
		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
	done
	$(INSTALL) -m 0644 server/logo.png $(DESTDIR)$(CONFDIR)/templates/
	$(INSTALL) -m 0644 server/style.css $(DESTDIR)$(CONFDIR)/templates/
	$(INSTALL) -m 0644 server/definitions.html $(DESTDIR)$(CONFDIR)/templates/
	$(INSTALL) -m 0755 server/VeraMono.ttf $(DESTDIR)$(LIBDIR)/
	$(INSTALL) -m 0644 resources/favicon.ico $(DESTDIR)$(HTMLDIR)/
	test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess
	test -f "$(DESTDIR)$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/server/munin.conf $(DESTDIR)$(CONFDIR)/
	$(INSTALL) -m 0755 build/server/munin-cron $(DESTDIR)$(BINDIR)/
	$(INSTALL) -m 0755 build/server/munin-check $(DESTDIR)$(BINDIR)/
	$(INSTALL) -m 0755 build/server/munin-update $(DESTDIR)$(LIBDIR)/
	$(INSTALL) -m 0755 build/server/munin-graph $(DESTDIR)$(LIBDIR)/
	$(INSTALL) -m 0755 build/server/munin-html $(DESTDIR)$(LIBDIR)/
	$(INSTALL) -m 0755 build/server/munin-limits $(DESTDIR)$(LIBDIR)/
	$(INSTALL) -m 0755 build/server/munin-cgi-graph $(DESTDIR)$(CGIDIR)/
	$(INSTALL) -m 0644 build/server/Munin.pm $(DESTDIR)$(PERLLIB)/

uninstall-main: build
	for p in build/server/*.tmpl; do    	    \
		rm -f $(DESTDIR)$(CONFDIR)/templates/"$$p"  ; \
	done
	rm -f $(DESTDIR)$(CONFDIR)/templates/logo.png
	rm -f $(DESTDIR)$(CONFDIR)/templates/style.css
	rm -f $(DESTDIR)$(CONFDIR)/templates/definitions.html
	rm -f $(DESTDIR)$(HTMLDIR)/.htaccess

	rm -f $(DESTDIR)$(CONFDIR)/munin.conf 

	rm -f $(DESTDIR)$(BINDIR)/munin-cron 
	rm -f $(DESTDIR)$(BINDIR)/munin-check

	rm -f $(DESTDIR)$(LIBDIR)/munin-update
	rm -f $(DESTDIR)$(LIBDIR)/munin-graph
	rm -f $(DESTDIR)$(LIBDIR)/munin-html
	rm -f $(DESTDIR)$(LIBDIR)/munin-limits
	rm -f $(DESTDIR)$(CGIDIR)/munin-cgi-graph

	rm -f $(DESTDIR)$(PERLLIB)/Munin.pm 
	-rmdir $(DESTDIR)$(CONFDIR)/templates
	-rmdir $(DESTDIR)$(CONFDIR)
	-rmdir $(DESTDIR)$(LIBDIR)
	-rmdir $(DESTDIR)$(BINDIR)

	-rmdir $(DESTDIR)$(LOGDIR)
	-rmdir $(DESTDIR)$(STATEDIR)
	-rmdir $(DESTDIR)$(HTMLDIR)
	-rmdir $(DESTDIR)$(DBDIR)
	-rmdir $(DESTDIR)$(CGIDIR)

install-node: build install-node-non-snmp install-node-snmp install-munindoc
	echo Done.

	echo Undone.

install-node-snmp: build
	$(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(DESTDIR)$(SBINDIR)/

install-munindoc: build
	$(INSTALL) -m 0755 build/node/munindoc $(DESTDIR)$(BINDIR)/

uninstall-node-snmp: build
	rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure-snmp
	-rmdir $(DESTDIR)$(SBINDIR)

install-node-non-snmp: build
	$(CHECKGROUP)
	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
	mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
	mkdir -p $(DESTDIR)$(SBINDIR)
	mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Plugin

	mkdir -p $(DESTDIR)$(LOGDIR)
	mkdir -p $(DESTDIR)$(STATEDIR)
	mkdir -p $(DESTDIR)$(PLUGSTATE)

	$(CHOWN) $(PLUGINUSER):$(GROUP) $(DESTDIR)$(PLUGSTATE)
	$(CHMOD) 0775 $(DESTDIR)$(PLUGSTATE)
	$(CHMOD) 0755 $(DESTDIR)$(CONFDIR)/plugin-conf.d

	$(INSTALL) -m 0755 build/node/munin-node $(DESTDIR)$(SBINDIR)/
	$(INSTALL) -m 0755 build/node/munin-node-configure $(DESTDIR)$(SBINDIR)/
	test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/
	$(INSTALL) -m 0755 build/node/munin-run $(DESTDIR)$(SBINDIR)/

uninstall-node-non-snmp: build
	rm -f $(DESTDIR)$(SBINDIR)/munin-node 
	rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure
	rm -f $(DESTDIR)$(CONFDIR)/munin-node.conf 
	rm -f $(DESTDIR)$(SBINDIR)/munin-run
	-rmdir $(DESTDIR)$(CONFDIR)/plugin-conf.d
	-rmdir $(DESTDIR)$(CONFDIR)
	-rmdir $(DESTDIR)$(SBINDIR)


# ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE

		if echo $(INSTALL_PLUGINS) |                           \
		   grep $$family >/dev/null; then 	               \
			echo Installing $$p;                           \
			$(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/;     \
		fi;                                                    \
	    fi                                                         \
	done
	-mv $(DESTDIR)$(LIBDIR)/plugins/*.adv $(DESTDIR)$(LIBDIR)
	-mkdir -p $(DESTDIR)$(PLUGSTATE)
	$(CHOWN) $(PLUGINUSER):$(GROUP) $(DESTDIR)$(PLUGSTATE)
	$(CHMOD) 0775 $(DESTDIR)$(PLUGSTATE)
	$(INSTALL) -m 0644 build/node/plugins.history $(DESTDIR)$(LIBDIR)/plugins/
	$(INSTALL) -m 0644 build/node/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/
	mkdir -p $(DESTDIR)$(PERLLIB)/Munin
	$(INSTALL) -m 0644 build/node/Plugin.pm $(DESTDIR)$(PERLLIB)/Munin/

uninstall-node-plugins: build $(PLUGINS)
	for p in build/node/node.d.$(OSTYPE)/* build/node/node.d/*; do \
	    rm -f $(DESTDIR)$(LIBDIR)/plugins/`basename $$p` \
	done
	rm -f $(DESTDIR)$(LIBDIR)/plugins/plugins.history
	rm -f $(DESTDIR)$(LIBDIR)/plugins/plugin.sh
	-rm -f $(DESTDIR)$(LIBDIR)/*.adv

#TODO:
# configure plugins.  Or not. Better done under the direction of the installer
# or the packager.

install-man: build-man Makefile Makefile.config
	mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8
	$(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(DESTDIR)$(MANDIR)/man5/
	$(INSTALL) -m 0644 build/doc/munin.conf.5 $(DESTDIR)$(MANDIR)/man5/
	$(INSTALL) -m 0644 build/doc/munin-node.8 $(DESTDIR)$(MANDIR)/man8/
	$(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(DESTDIR)$(MANDIR)/man8/
	$(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(DESTDIR)$(MANDIR)/man8/
	$(INSTALL) -m 0644 build/doc/munin-run.8 $(DESTDIR)$(MANDIR)/man8/
	$(INSTALL) -m 0644 build/doc/munin-graph.8 $(DESTDIR)$(MANDIR)/man8/
	$(INSTALL) -m 0644 build/doc/munin-update.8 $(DESTDIR)$(MANDIR)/man8/
	$(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/
	$(INSTALL) -m 0644 build/doc/munin-html.8 $(DESTDIR)$(MANDIR)/man8/
	$(INSTALL) -m 0644 build/doc/munin-cron.8 $(DESTDIR)$(MANDIR)/man8/

uninstall-man: build-man
	rm -f $(DESTDIR)$(MANDIR)/man5/munin-node.conf.5 
	rm -f $(DESTDIR)$(MANDIR)/man5/munin.conf.5 
	rm -f $(DESTDIR)$(MANDIR)/man8/munin-node.8
	rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure.8 
	rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure-snmp.8
	rm -f $(DESTDIR)$(MANDIR)/man8/munin-run.8
	rm -f $(DESTDIR)$(MANDIR)/man8/munin-graph.8 
	rm -f $(DESTDIR)$(MANDIR)/man8/munin-update.8 
	rm -f $(DESTDIR)$(MANDIR)/man8/munin-limits.8
	rm -f $(DESTDIR)$(MANDIR)/man8/munin-html.8
	rm -f $(DESTDIR)$(MANDIR)/man8/munin-cron.8 
	-rmdir $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8 $(MANDIR)

install-doc: build-doc
	mkdir -p $(DESTDIR)$(DOCDIR)/resources
	$(INSTALL) -m 0644 README $(DESTDIR)$(DOCDIR)/
	$(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/
	$(INSTALL) -m 0644 build/resources/* $(DESTDIR)$(DOCDIR)/resources

uninstall-doc: build-doc
	rm -rf $(DESTDIR)$(DOCDIR)

build: build-stamp


endif

node-monkeywrench: install-node
	rm -rf $(DESTDIR)$(CONFDIR)/plugins
	rm -rf $(DESTDIR)$(LIBDIR)/plugins
	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
	cp monkeywrench/plugin-break*_ $(DESTDIR)$(LIBDIR)/plugins/
	$(SBINDIR)/munin-node-configure --suggest
	echo 'Done?'





#
# the base of the Munin installation.
# 
PREFIX     = /usr

# Where Munin keeps its configurations (server.conf, client.conf, ++)
CONFDIR    = /etc/munin

# Server only - where to put munin-cron
BINDIR     = $(PREFIX)/bin

SBINDIR    = $(PREFIX)/sbin

# Where to put text and html documentation
DOCDIR     = $(PREFIX)/share/doc/munin-$(VERSION)

# Where to put man pages
MANDIR     = $(PREFIX)/share/man

# Where to put internal binaries and plugin repository
LIBDIR     = $(PREFIX)/libexec/munin

# Server only - Output directory
HTMLDIR    = /var/www/localhost/htdocs/munin
CGIDIR     = /var/www/localhost/cgi-bin

# Client only - Where to put RRD files and other intenal data
DBDIR      = /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     = /var/log/munin

# Location of PID files and other statefiles. On the server, must be
# writable by the user "munin".
STATEDIR   = /var/run/munin

# The perl interpreter to use
PERL       = $(shell which perl)

BASH       = /bin/bash

# Server only - Where to install the perl libraries
PERLLIB    = $(shell $(PERL) -V:sitelib | cut -d"'" -f2)

# Client only - Install plugins for this architecture
# LANG=C is because some locales are a bit different in their alphabet (eg ee_EE).
OSTYPE     = $(shell uname | LANG=C tr '[A-Z]' '[a-z]')

# How to figure out the hostname. (Only used in default configuration
# files)

Return to bug 214152

Lines 9-18 Link Here

(-)munin-1.3.3.orig/Makefile.config (-12 / +13 lines)
9	#	9	#
10	# the base of the Munin installation.	10	# the base of the Munin installation.
11	#	11	#
12	PREFIX = $(DESTDIR)/opt/munin	12	PREFIX = /usr
13		13
14	# Where Munin keeps its configurations (server.conf, client.conf, ++)	14	# Where Munin keeps its configurations (server.conf, client.conf, ++)
15	CONFDIR = $(DESTDIR)/etc/opt/munin	15	CONFDIR = /etc/munin
16		16
17	# Server only - where to put munin-cron	17	# Server only - where to put munin-cron
18	BINDIR = $(PREFIX)/bin	18	BINDIR = $(PREFIX)/bin
Lines 21-51 Link Here
21	SBINDIR = $(PREFIX)/sbin	21	SBINDIR = $(PREFIX)/sbin
22		22
23	# Where to put text and html documentation	23	# Where to put text and html documentation
24	DOCDIR = $(PREFIX)/doc	24	DOCDIR = $(PREFIX)/share/doc/munin-$(VERSION)
25		25
26	# Where to put man pages	26	# Where to put man pages
27	MANDIR = $(PREFIX)/man	27	MANDIR = $(PREFIX)/share/man
28		28
29	# Where to put internal binaries and plugin repository	29	# Where to put internal binaries and plugin repository
30	LIBDIR = $(PREFIX)/lib	30	LIBDIR = $(PREFIX)/libexec/munin
31		31
32	# Server only - Output directory	32	# Server only - Output directory
33	HTMLDIR = $(PREFIX)/var/www	33	HTMLDIR = /var/www/localhost/htdocs/munin
34	CGIDIR = $(HTMLDIR)/cgi	34	CGIDIR = /var/www/localhost/cgi-bin
35		35
36	# Client only - Where to put RRD files and other intenal data	36	# Client only - Where to put RRD files and other intenal data
37	DBDIR = $(DESTDIR)/var/opt/munin	37	DBDIR = /var/lib/munin
38		38
39	# Client only - Where plugins should put their states. Must be writable by	39	# Client only - Where plugins should put their states. Must be writable by
40	# group "munin", and should be preserved between reboots	40	# group "munin", and should be preserved between reboots
41	PLUGSTATE = $(DBDIR)/plugin-state	41	PLUGSTATE = $(DBDIR)/plugin-state
42		42
43	# Where Munin should place its logs.	43	# Where Munin should place its logs.
44	LOGDIR = $(DESTDIR)/var/log/munin	44	LOGDIR = /var/log/munin
45		45
46	# Location of PID files and other statefiles. On the server, must be	46	# Location of PID files and other statefiles. On the server, must be
47	# writable by the user "munin".	47	# writable by the user "munin".
48	STATEDIR = $(DESTDIR)/var/run/munin	48	STATEDIR = /var/run/munin
49		49
50	# The perl interpreter to use	50	# The perl interpreter to use
51	PERL = $(shell which perl)	51	PERL = $(shell which perl)
Lines 67-76 Link Here
67	BASH = /bin/bash	67	BASH = /bin/bash
68		68
69	# Server only - Where to install the perl libraries	69	# Server only - Where to install the perl libraries
70	PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib \| cut -d"'" -f2)	70	PERLLIB = $(shell $(PERL) -V:sitelib \| cut -d"'" -f2)
71		71
72	# Client only - Install plugins for this architecture	72	# Client only - Install plugins for this architecture
73	OSTYPE = $(shell uname \| tr '[A-Z]' '[a-z]')	73	# LANG=C is because some locales are a bit different in their alphabet (eg ee_EE).
		74	OSTYPE = $(shell uname \| LANG=C tr '[A-Z]' '[a-z]')
74		75
75	# How to figure out the hostname. (Only used in default configuration	76	# How to figure out the hostname. (Only used in default configuration
76	# files)	77	# files)

Lines 28-101 Link Here

(-)munin-1.3.4/Makefile.old (-133 / +133 lines)
28	# This removes the installed config so that the next install-pass installs	28	# This removes the installed config so that the next install-pass installs
29	# a new config. Target suitable for maintainers	29	# a new config. Target suitable for maintainers
30	unconfig:	30	unconfig:
31	rm -f $(HTMLDIR)/.htaccess	31	rm -f $(DESTDIR)$(HTMLDIR)/.htaccess
32	rm -f $(CONFDIR)/munin.conf	32	rm -f $(DESTDIR)$(CONFDIR)/munin.conf
33		33
34	install-main: build	34	install-main: build
35	$(CHECKUSER)	35	$(CHECKUSER)
36	mkdir -p $(CONFDIR)/templates	36	mkdir -p $(DESTDIR)$(CONFDIR)/templates
37	mkdir -p $(LIBDIR)	37	mkdir -p $(DESTDIR)$(LIBDIR)
38	mkdir -p $(BINDIR)	38	mkdir -p $(DESTDIR)$(BINDIR)
39	mkdir -p $(PERLLIB)	39	mkdir -p $(DESTDIR)$(PERLLIB)
40		40
41	mkdir -p $(LOGDIR)	41	mkdir -p $(DESTDIR)$(LOGDIR)
42	mkdir -p $(STATEDIR)	42	mkdir -p $(DESTDIR)$(STATEDIR)
43	mkdir -p $(HTMLDIR)	43	mkdir -p $(DESTDIR)$(HTMLDIR)
44	mkdir -p $(DBDIR)	44	mkdir -p $(DESTDIR)$(DBDIR)
45	mkdir -p $(CGIDIR)	45	mkdir -p $(DESTDIR)$(CGIDIR)
46		46
47	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)	47	$(CHOWN) $(USER) $(DESTDIR)$(LOGDIR) $(DESTDIR)$(STATEDIR) $(DESTDIR)$(RUNDIR) $(DESTDIR)$(HTMLDIR) $(DESTDIR)$(DBDIR)
48		48
49	for p in build/server/*.tmpl; do \	49	for p in build/server/*.tmpl; do \
50	$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \	50	$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
51	done	51	done
52	$(INSTALL) -m 0644 server/logo.png $(CONFDIR)/templates/	52	$(INSTALL) -m 0644 server/logo.png $(DESTDIR)$(CONFDIR)/templates/
53	$(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/	53	$(INSTALL) -m 0644 server/style.css $(DESTDIR)$(CONFDIR)/templates/
54	$(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/	54	$(INSTALL) -m 0644 server/definitions.html $(DESTDIR)$(CONFDIR)/templates/
55	$(INSTALL) -m 0755 server/VeraMono.ttf $(LIBDIR)/	55	$(INSTALL) -m 0755 server/VeraMono.ttf $(DESTDIR)$(LIBDIR)/
56	$(INSTALL) -m 0644 resources/favicon.ico $(HTMLDIR)/	56	$(INSTALL) -m 0644 resources/favicon.ico $(DESTDIR)$(HTMLDIR)/
57	test -f $(HTMLDIR)/.htaccess \|\| $(INSTALL) -m 0644 build/server/munin-htaccess $(HTMLDIR)/.htaccess	57	test -f $(DESTDIR)$(HTMLDIR)/.htaccess \|\| $(INSTALL) -m 0644 build/server/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess
58	test -f "$(CONFDIR)/munin.conf" \|\| $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/	58	test -f "$(DESTDIR)$(CONFDIR)/munin.conf" \|\| $(INSTALL) -m 0644 build/server/munin.conf $(DESTDIR)$(CONFDIR)/
59	$(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/	59	$(INSTALL) -m 0755 build/server/munin-cron $(DESTDIR)$(BINDIR)/
60	$(INSTALL) -m 0755 build/server/munin-check $(BINDIR)/	60	$(INSTALL) -m 0755 build/server/munin-check $(DESTDIR)$(BINDIR)/
61	$(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/	61	$(INSTALL) -m 0755 build/server/munin-update $(DESTDIR)$(LIBDIR)/
62	$(INSTALL) -m 0755 build/server/munin-graph $(LIBDIR)/	62	$(INSTALL) -m 0755 build/server/munin-graph $(DESTDIR)$(LIBDIR)/
63	$(INSTALL) -m 0755 build/server/munin-html $(LIBDIR)/	63	$(INSTALL) -m 0755 build/server/munin-html $(DESTDIR)$(LIBDIR)/
64	$(INSTALL) -m 0755 build/server/munin-limits $(LIBDIR)/	64	$(INSTALL) -m 0755 build/server/munin-limits $(DESTDIR)$(LIBDIR)/
65	$(INSTALL) -m 0755 build/server/munin-cgi-graph $(CGIDIR)/	65	$(INSTALL) -m 0755 build/server/munin-cgi-graph $(DESTDIR)$(CGIDIR)/
66	$(INSTALL) -m 0644 build/server/Munin.pm $(PERLLIB)/	66	$(INSTALL) -m 0644 build/server/Munin.pm $(DESTDIR)$(PERLLIB)/
67		67
68	uninstall-main: build	68	uninstall-main: build
69	for p in build/server/*.tmpl; do \	69	for p in build/server/*.tmpl; do \
70	rm -f $(CONFDIR)/templates/"$$p" ; \	70	rm -f $(DESTDIR)$(CONFDIR)/templates/"$$p" ; \
71	done	71	done
72	rm -f $(CONFDIR)/templates/logo.png	72	rm -f $(DESTDIR)$(CONFDIR)/templates/logo.png
73	rm -f $(CONFDIR)/templates/style.css	73	rm -f $(DESTDIR)$(CONFDIR)/templates/style.css
74	rm -f $(CONFDIR)/templates/definitions.html	74	rm -f $(DESTDIR)$(CONFDIR)/templates/definitions.html
75	rm -f $(HTMLDIR)/.htaccess	75	rm -f $(DESTDIR)$(HTMLDIR)/.htaccess
76		76
77	rm -f $(CONFDIR)/munin.conf	77	rm -f $(DESTDIR)$(CONFDIR)/munin.conf
78		78
79	rm -f $(BINDIR)/munin-cron	79	rm -f $(DESTDIR)$(BINDIR)/munin-cron
80	rm -f $(BINDIR)/munin-check	80	rm -f $(DESTDIR)$(BINDIR)/munin-check
81		81
82	rm -f $(LIBDIR)/munin-update	82	rm -f $(DESTDIR)$(LIBDIR)/munin-update
83	rm -f $(LIBDIR)/munin-graph	83	rm -f $(DESTDIR)$(LIBDIR)/munin-graph
84	rm -f $(LIBDIR)/munin-html	84	rm -f $(DESTDIR)$(LIBDIR)/munin-html
85	rm -f $(LIBDIR)/munin-limits	85	rm -f $(DESTDIR)$(LIBDIR)/munin-limits
86	rm -f $(CGIDIR)/munin-cgi-graph	86	rm -f $(DESTDIR)$(CGIDIR)/munin-cgi-graph
87		87
88	rm -f $(PERLLIB)/Munin.pm	88	rm -f $(DESTDIR)$(PERLLIB)/Munin.pm
89	-rmdir $(CONFDIR)/templates	89	-rmdir $(DESTDIR)$(CONFDIR)/templates
90	-rmdir $(CONFDIR)	90	-rmdir $(DESTDIR)$(CONFDIR)
91	-rmdir $(LIBDIR)	91	-rmdir $(DESTDIR)$(LIBDIR)
92	-rmdir $(BINDIR)	92	-rmdir $(DESTDIR)$(BINDIR)
93		93
94	-rmdir $(LOGDIR)	94	-rmdir $(DESTDIR)$(LOGDIR)
95	-rmdir $(STATEDIR)	95	-rmdir $(DESTDIR)$(STATEDIR)
96	-rmdir $(HTMLDIR)	96	-rmdir $(DESTDIR)$(HTMLDIR)
97	-rmdir $(DBDIR)	97	-rmdir $(DESTDIR)$(DBDIR)
98	-rmdir $(CGIDIR)	98	-rmdir $(DESTDIR)$(CGIDIR)
99		99
100	install-node: build install-node-non-snmp install-node-snmp install-munindoc	100	install-node: build install-node-non-snmp install-node-snmp install-munindoc
101	echo Done.	101	echo Done.
Lines 104-147 Link Here
104	echo Undone.	104	echo Undone.
105		105
106	install-node-snmp: build	106	install-node-snmp: build
107	$(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(SBINDIR)/	107	$(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(DESTDIR)$(SBINDIR)/
108		108
109	install-munindoc: build	109	install-munindoc: build
110	$(INSTALL) -m 0755 build/node/munindoc $(BINDIR)/	110	$(INSTALL) -m 0755 build/node/munindoc $(DESTDIR)$(BINDIR)/
111		111
112	uninstall-node-snmp: build	112	uninstall-node-snmp: build
113	rm -f $(SBINDIR)/munin-node-configure-snmp	113	rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure-snmp
114	-rmdir $(SBINDIR)	114	-rmdir $(DESTDIR)$(SBINDIR)
115		115
116	install-node-non-snmp: build	116	install-node-non-snmp: build
117	$(CHECKGROUP)	117	$(CHECKGROUP)
118	mkdir -p $(CONFDIR)/plugins	118	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
119	mkdir -p $(CONFDIR)/plugin-conf.d	119	mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
120	mkdir -p $(LIBDIR)/plugins	120	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
121	mkdir -p $(SBINDIR)	121	mkdir -p $(DESTDIR)$(SBINDIR)
122	mkdir -p $(PERLLIB)/Munin/Plugin	122	mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Plugin
123		123
124	mkdir -p $(LOGDIR)	124	mkdir -p $(DESTDIR)$(LOGDIR)
125	mkdir -p $(STATEDIR)	125	mkdir -p $(DESTDIR)$(STATEDIR)
126	mkdir -p $(PLUGSTATE)	126	mkdir -p $(DESTDIR)$(PLUGSTATE)
127		127
128	$(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)	128	$(CHOWN) $(PLUGINUSER):$(GROUP) $(DESTDIR)$(PLUGSTATE)
129	$(CHMOD) 0775 $(PLUGSTATE)	129	$(CHMOD) 0775 $(DESTDIR)$(PLUGSTATE)
130	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d	130	$(CHMOD) 0755 $(DESTDIR)$(CONFDIR)/plugin-conf.d
131		131
132	$(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/	132	$(INSTALL) -m 0755 build/node/munin-node $(DESTDIR)$(SBINDIR)/
133	$(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/	133	$(INSTALL) -m 0755 build/node/munin-node-configure $(DESTDIR)$(SBINDIR)/
134	test -f "$(CONFDIR)/munin-node.conf" \|\| $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/	134	test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" \|\| $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/
135	$(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/	135	$(INSTALL) -m 0755 build/node/munin-run $(DESTDIR)$(SBINDIR)/
136		136
137	uninstall-node-non-snmp: build	137	uninstall-node-non-snmp: build
138	rm -f $(SBINDIR)/munin-node	138	rm -f $(DESTDIR)$(SBINDIR)/munin-node
139	rm -f $(SBINDIR)/munin-node-configure	139	rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure
140	rm -f $(CONFDIR)/munin-node.conf	140	rm -f $(DESTDIR)$(CONFDIR)/munin-node.conf
141	rm -f $(SBINDIR)/munin-run	141	rm -f $(DESTDIR)$(SBINDIR)/munin-run
142	-rmdir $(CONFDIR)/plugin-conf.d	142	-rmdir $(DESTDIR)$(CONFDIR)/plugin-conf.d
143	-rmdir $(CONFDIR)	143	-rmdir $(DESTDIR)$(CONFDIR)
144	-rmdir $(SBINDIR)	144	-rmdir $(DESTDIR)$(SBINDIR)
145		145
146		146
147	# ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE	147	# ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE
Lines 156-222 Link Here
156	if echo $(INSTALL_PLUGINS) \| \	156	if echo $(INSTALL_PLUGINS) \| \
157	grep $$family >/dev/null; then \	157	grep $$family >/dev/null; then \
158	echo Installing $$p; \	158	echo Installing $$p; \
159	$(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \	159	$(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \
160	fi; \	160	fi; \
161	fi \	161	fi \
162	done	162	done
163	-mv $(LIBDIR)/plugins/*.adv $(LIBDIR)	163	-mv $(DESTDIR)$(LIBDIR)/plugins/*.adv $(DESTDIR)$(LIBDIR)
164	-mkdir -p $(PLUGSTATE)	164	-mkdir -p $(DESTDIR)$(PLUGSTATE)
165	$(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)	165	$(CHOWN) $(PLUGINUSER):$(GROUP) $(DESTDIR)$(PLUGSTATE)
166	$(CHMOD) 0775 $(PLUGSTATE)	166	$(CHMOD) 0775 $(DESTDIR)$(PLUGSTATE)
167	$(INSTALL) -m 0644 build/node/plugins.history $(LIBDIR)/plugins/	167	$(INSTALL) -m 0644 build/node/plugins.history $(DESTDIR)$(LIBDIR)/plugins/
168	$(INSTALL) -m 0644 build/node/plugin.sh $(LIBDIR)/plugins/	168	$(INSTALL) -m 0644 build/node/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/
169	mkdir -p $(PERLLIB)/Munin	169	mkdir -p $(DESTDIR)$(PERLLIB)/Munin
170	$(INSTALL) -m 0644 build/node/Plugin.pm $(PERLLIB)/Munin/	170	$(INSTALL) -m 0644 build/node/Plugin.pm $(DESTDIR)$(PERLLIB)/Munin/
171		171
172	uninstall-node-plugins: build $(PLUGINS)	172	uninstall-node-plugins: build $(PLUGINS)
173	for p in build/node/node.d.$(OSTYPE)/* build/node/node.d/*; do \	173	for p in build/node/node.d.$(OSTYPE)/* build/node/node.d/*; do \
174	rm -f $(LIBDIR)/plugins/`basename $$p` \	174	rm -f $(DESTDIR)$(LIBDIR)/plugins/`basename $$p` \
175	done	175	done
176	rm -f $(LIBDIR)/plugins/plugins.history	176	rm -f $(DESTDIR)$(LIBDIR)/plugins/plugins.history
177	rm -f $(LIBDIR)/plugins/plugin.sh	177	rm -f $(DESTDIR)$(LIBDIR)/plugins/plugin.sh
178	-rm -f $(LIBDIR)/*.adv	178	-rm -f $(DESTDIR)$(LIBDIR)/*.adv
179		179
180	#TODO:	180	#TODO:
181	# configure plugins. Or not. Better done under the direction of the installer	181	# configure plugins. Or not. Better done under the direction of the installer
182	# or the packager.	182	# or the packager.
183		183
184	install-man: build-man Makefile Makefile.config	184	install-man: build-man Makefile Makefile.config
185	mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8	185	mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8
186	$(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/	186	$(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(DESTDIR)$(MANDIR)/man5/
187	$(INSTALL) -m 0644 build/doc/munin.conf.5 $(MANDIR)/man5/	187	$(INSTALL) -m 0644 build/doc/munin.conf.5 $(DESTDIR)$(MANDIR)/man5/
188	$(INSTALL) -m 0644 build/doc/munin-node.8 $(MANDIR)/man8/	188	$(INSTALL) -m 0644 build/doc/munin-node.8 $(DESTDIR)$(MANDIR)/man8/
189	$(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(MANDIR)/man8/	189	$(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(DESTDIR)$(MANDIR)/man8/
190	$(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(MANDIR)/man8/	190	$(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(DESTDIR)$(MANDIR)/man8/
191	$(INSTALL) -m 0644 build/doc/munin-run.8 $(MANDIR)/man8/	191	$(INSTALL) -m 0644 build/doc/munin-run.8 $(DESTDIR)$(MANDIR)/man8/
192	$(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/	192	$(INSTALL) -m 0644 build/doc/munin-graph.8 $(DESTDIR)$(MANDIR)/man8/
193	$(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/	193	$(INSTALL) -m 0644 build/doc/munin-update.8 $(DESTDIR)$(MANDIR)/man8/
194	$(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/	194	$(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/
195	$(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/	195	$(INSTALL) -m 0644 build/doc/munin-html.8 $(DESTDIR)$(MANDIR)/man8/
196	$(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/	196	$(INSTALL) -m 0644 build/doc/munin-cron.8 $(DESTDIR)$(MANDIR)/man8/
197		197
198	uninstall-man: build-man	198	uninstall-man: build-man
199	rm -f $(MANDIR)/man5/munin-node.conf.5	199	rm -f $(DESTDIR)$(MANDIR)/man5/munin-node.conf.5
200	rm -f $(MANDIR)/man5/munin.conf.5	200	rm -f $(DESTDIR)$(MANDIR)/man5/munin.conf.5
201	rm -f $(MANDIR)/man8/munin-node.8	201	rm -f $(DESTDIR)$(MANDIR)/man8/munin-node.8
202	rm -f $(MANDIR)/man8/munin-node-configure.8	202	rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure.8
203	rm -f $(MANDIR)/man8/munin-node-configure-snmp.8	203	rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure-snmp.8
204	rm -f $(MANDIR)/man8/munin-run.8	204	rm -f $(DESTDIR)$(MANDIR)/man8/munin-run.8
205	rm -f $(MANDIR)/man8/munin-graph.8	205	rm -f $(DESTDIR)$(MANDIR)/man8/munin-graph.8
206	rm -f $(MANDIR)/man8/munin-update.8	206	rm -f $(DESTDIR)$(MANDIR)/man8/munin-update.8
207	rm -f $(MANDIR)/man8/munin-limits.8	207	rm -f $(DESTDIR)$(MANDIR)/man8/munin-limits.8
208	rm -f $(MANDIR)/man8/munin-html.8	208	rm -f $(DESTDIR)$(MANDIR)/man8/munin-html.8
209	rm -f $(MANDIR)/man8/munin-cron.8	209	rm -f $(DESTDIR)$(MANDIR)/man8/munin-cron.8
210	-rmdir $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 $(MANDIR)	210	-rmdir $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8 $(MANDIR)
211		211
212	install-doc: build-doc	212	install-doc: build-doc
213	mkdir -p $(DOCDIR)/resources	213	mkdir -p $(DESTDIR)$(DOCDIR)/resources
214	$(INSTALL) -m 0644 README $(DOCDIR)/	214	$(INSTALL) -m 0644 README $(DESTDIR)$(DOCDIR)/
215	$(INSTALL) -m 0644 COPYING $(DOCDIR)/	215	$(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/
216	$(INSTALL) -m 0644 build/resources/* $(DOCDIR)/resources	216	$(INSTALL) -m 0644 build/resources/* $(DESTDIR)$(DOCDIR)/resources
217		217
218	uninstall-doc: build-doc	218	uninstall-doc: build-doc
219	rm -rf $(DOCDIR)	219	rm -rf $(DESTDIR)$(DOCDIR)
220		220
221	build: build-stamp	221	build: build-stamp
222		222
Lines 371-381 Link Here
371	endif	371	endif
372		372
373	node-monkeywrench: install-node	373	node-monkeywrench: install-node
374	rm -rf $(CONFDIR)/plugins	374	rm -rf $(DESTDIR)$(CONFDIR)/plugins
375	rm -rf $(LIBDIR)/plugins	375	rm -rf $(DESTDIR)$(LIBDIR)/plugins
376	mkdir -p $(LIBDIR)/plugins	376	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
377	mkdir -p $(CONFDIR)/plugins	377	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
378	cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/	378	cp monkeywrench/plugin-break*_ $(DESTDIR)$(LIBDIR)/plugins/
379	$(SBINDIR)/munin-node-configure --suggest	379	$(SBINDIR)/munin-node-configure --suggest
380	echo 'Done?'	380	echo 'Done?'
381		381