$NetBSD: patch-ad,v 1.3 2010/07/17 11:47:57 abs Exp $

--- Makefile.orig	2005-04-15 20:37:29.000000000 +0000
+++ Makefile
@@ -17,7 +17,7 @@ install: install-main install-node insta
 
 install-main: build
 	$(CHECKUSER)
-	mkdir -p $(CONFDIR)/templates
+	mkdir -p $(DESTDIR)$(CONFDIR)/templates
 	mkdir -p $(LIBDIR)
 	mkdir -p $(BINDIR)
 	mkdir -p $(PERLLIB)
@@ -31,13 +31,11 @@ install-main: build
 	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
 
 	for p in build/server/*.tmpl; do    		              \
-		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
+		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
 	done
-	$(INSTALL) -m 0644 server/logo.png $(CONFDIR)/templates/
-	$(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/
-	$(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/
-
-	test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/
+	$(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 build/server/munin-cron $(BINDIR)/
 
@@ -57,11 +55,10 @@ install-node-snmp: build
 
 install-node-non-snmp: build
 	$(CHECKGROUP)
-	mkdir -p $(CONFDIR)/plugins
-	mkdir -p $(CONFDIR)/plugin-conf.d
+	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
+	mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
 	mkdir -p $(LIBDIR)/plugins
 	mkdir -p $(SBINDIR)
-	mkdir -p $(PERLLIB)/Munin/Plugin
 
 	mkdir -p $(LOGDIR)
 	mkdir -p $(STATEDIR)
@@ -69,11 +66,10 @@ install-node-non-snmp: build
 
 	$(CHGRP) $(GROUP) $(PLUGSTATE)
 	$(CHMOD) 775 $(PLUGSTATE)
-	$(CHMOD) 755 $(CONFDIR)/plugin-conf.d
+	$(CHMOD) 755 $(DESTDIR)$(CONFDIR)/plugin-conf.d
 
 	$(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/
 	$(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/
-	test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
 	$(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/
 	
 install-node-plugins: build