272e6e990f
with fixes from the stable branch.
Changes since previous version:
This release implements proper TLS support, as well as all the
bugfixes from the 1.2 stable series.
pkgsrc changes:
* Fixed many pkglint warnings.
* Install munin.conf and munin-node.conf as ${INSTALL_DATA} not
${INSTALL_SCRIPT}, I couldn't see any reason why those were
installed as scripts.
* Added VARBASE into BUILD_DEFS, as suggested by pkglint.
46 lines
1.6 KiB
Text
46 lines
1.6 KiB
Text
$NetBSD: patch-ad,v 1.3 2006/12/05 14:53:32 xtraeme Exp $
|
|
|
|
--- Makefile.orig 2006-12-05 15:43:41.000000000 +0100
|
|
+++ Makefile 2006-12-05 15:46:20.000000000 +0100
|
|
@@ -18,6 +18,7 @@
|
|
install-main: build
|
|
$(CHECKUSER)
|
|
mkdir -p $(CONFDIR)/templates
|
|
+ mkdir -p $(EGDIR)/templates
|
|
mkdir -p $(LIBDIR)
|
|
mkdir -p $(BINDIR)
|
|
mkdir -p $(PERLLIB)
|
|
@@ -25,19 +26,20 @@
|
|
mkdir -p $(LOGDIR)
|
|
mkdir -p $(STATEDIR)
|
|
mkdir -p $(HTMLDIR)
|
|
+ mkdir -p $(CGIDIR)
|
|
mkdir -p $(DBDIR)
|
|
mkdir -p $(CGIDIR)
|
|
|
|
$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
|
|
+ $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR) $(CGIDIR)
|
|
|
|
for p in build/server/*.tmpl; do \
|
|
- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
|
|
+ $(INSTALL) -m 0644 "$$p" $(EGDIR)/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/
|
|
+ $(INSTALL) -m 0644 server/logo.png $(EGDIR)/templates/
|
|
+ $(INSTALL) -m 0644 server/style.css $(EGDIR)/templates/
|
|
+ $(INSTALL) -m 0644 server/definitions.html $(EGDIR)/templates/
|
|
|
|
- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/
|
|
|
|
$(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/
|
|
|
|
@@ -73,7 +75,6 @@
|
|
|
|
$(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
|