summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2018-10-07 11:58:44 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-10-07 18:27:58 +0200
commit2043f3df5461ee66788893aa2425b2b7cc112a1b (patch)
tree6c45db98c9602765fb624b1c5da1f30e68042acc
parente771c707fe90ecb6fbcb79ae66b07d3051949f8c (diff)
downloadptxdist-2043f3df5461ee66788893aa2425b2b7cc112a1b.tar.gz
ptxdist-2043f3df5461ee66788893aa2425b2b7cc112a1b.tar.xz
munin: rename config file variable
The file is generated during prepare. Rename the variable to avoid the generated dependency. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/munin.make52
1 files changed, 26 insertions, 26 deletions
diff --git a/rules/munin.make b/rules/munin.make
index e362ffae5..e84787367 100644
--- a/rules/munin.make
+++ b/rules/munin.make
@@ -30,38 +30,38 @@ MUNIN_MAKE_PAR := NO
# Prepare
# ----------------------------------------------------------------------------
-MUNIN_CONFIG := $(MUNIN_DIR)/Makefile.config.ptx
+MUNIN_MAKE_CFG := $(MUNIN_DIR)/Makefile.config.ptx
$(STATEDIR)/munin.prepare:
@$(call targetinfo)
- @echo '# Generated by PTXdist' > $(MUNIN_CONFIG)
- @echo 'PREFIX = $$(DESTDIR)/usr' >> $(MUNIN_CONFIG)
- @echo 'CONFDIR = $$(DESTDIR)/etc/munin' >> $(MUNIN_CONFIG)
- @echo 'LIBDIR = $$(PREFIX)/lib/munin' >> $(MUNIN_CONFIG)
- @echo 'HTMLDIR = $$(DESTDIR)/var/www/munin' >> $(MUNIN_CONFIG)
- @echo 'CGIDIR = $$(HTMLDIR)/cgi' >> $(MUNIN_CONFIG)
- @echo 'DBDIR = $$(DESTDIR)/var/munin' >> $(MUNIN_CONFIG)
- @echo 'DBDIRNODE = $$(DESTDIR)/var/munin-node' >> $(MUNIN_CONFIG)
- @echo 'LOGDIR = $$(DESTDIR)/var/log' >> $(MUNIN_CONFIG)
- @echo 'STATEDIR = $$(DESTDIR)/run' >> $(MUNIN_CONFIG)
- @echo 'PERL = /usr/bin/perl' >> $(MUNIN_CONFIG)
- @echo 'GOODSH = /bin/bash' >> $(MUNIN_CONFIG)
- @echo 'PERLSITELIB = $(PERL_SITELIB)' >> $(MUNIN_CONFIG)
- @echo 'OSTYPE = linux' >> $(MUNIN_CONFIG)
- @echo 'HOSTNAME = $(call remove_quotes,$(PTXCONF_ROOTFS_ETC_HOSTNAME))' >> $(MUNIN_CONFIG)
- @echo 'MKTEMP = mktemp -p /tmp/ $$1' >> $(MUNIN_CONFIG)
- @echo 'VERSION = $(MUNIN_VERSION)' >> $(MUNIN_CONFIG)
- @echo 'USER = root' >> $(MUNIN_CONFIG)
- @echo 'GROUP = root' >> $(MUNIN_CONFIG)
- @echo 'CHECKUSER =' >> $(MUNIN_CONFIG)
- @echo 'CHECKGROUP =' >> $(MUNIN_CONFIG)
- @echo 'JCVALID = no' >> $(MUNIN_CONFIG)
- @echo 'HASSETR = 1' >> $(MUNIN_CONFIG)
+ @echo '# Generated by PTXdist' > $(MUNIN_MAKE_CFG)
+ @echo 'PREFIX = $$(DESTDIR)/usr' >> $(MUNIN_MAKE_CFG)
+ @echo 'CONFDIR = $$(DESTDIR)/etc/munin' >> $(MUNIN_MAKE_CFG)
+ @echo 'LIBDIR = $$(PREFIX)/lib/munin' >> $(MUNIN_MAKE_CFG)
+ @echo 'HTMLDIR = $$(DESTDIR)/var/www/munin' >> $(MUNIN_MAKE_CFG)
+ @echo 'CGIDIR = $$(HTMLDIR)/cgi' >> $(MUNIN_MAKE_CFG)
+ @echo 'DBDIR = $$(DESTDIR)/var/munin' >> $(MUNIN_MAKE_CFG)
+ @echo 'DBDIRNODE = $$(DESTDIR)/var/munin-node' >> $(MUNIN_MAKE_CFG)
+ @echo 'LOGDIR = $$(DESTDIR)/var/log' >> $(MUNIN_MAKE_CFG)
+ @echo 'STATEDIR = $$(DESTDIR)/run' >> $(MUNIN_MAKE_CFG)
+ @echo 'PERL = /usr/bin/perl' >> $(MUNIN_MAKE_CFG)
+ @echo 'GOODSH = /bin/bash' >> $(MUNIN_MAKE_CFG)
+ @echo 'PERLSITELIB = $(PERL_SITELIB)' >> $(MUNIN_MAKE_CFG)
+ @echo 'OSTYPE = linux' >> $(MUNIN_MAKE_CFG)
+ @echo 'HOSTNAME = $(call remove_quotes,$(PTXCONF_ROOTFS_ETC_HOSTNAME))' >> $(MUNIN_MAKE_CFG)
+ @echo 'MKTEMP = mktemp -p /tmp/ $$1' >> $(MUNIN_MAKE_CFG)
+ @echo 'VERSION = $(MUNIN_VERSION)' >> $(MUNIN_MAKE_CFG)
+ @echo 'USER = root' >> $(MUNIN_MAKE_CFG)
+ @echo 'GROUP = root' >> $(MUNIN_MAKE_CFG)
+ @echo 'CHECKUSER =' >> $(MUNIN_MAKE_CFG)
+ @echo 'CHECKGROUP =' >> $(MUNIN_MAKE_CFG)
+ @echo 'JCVALID = no' >> $(MUNIN_MAKE_CFG)
+ @echo 'HASSETR = 1' >> $(MUNIN_MAKE_CFG)
@$(call touch)
MUNIN_MAKE_ENV := $(CROSS_ENV)
-MUNIN_MAKE_OPT := CONFIG=$(MUNIN_CONFIG) PERL="perl -I."
-MUNIN_INSTALL_OPT := CONFIG=$(MUNIN_CONFIG) install
+MUNIN_MAKE_OPT := CONFIG=$(MUNIN_MAKE_CFG) PERL="perl -I."
+MUNIN_INSTALL_OPT := CONFIG=$(MUNIN_MAKE_CFG) install
# ----------------------------------------------------------------------------
# Target-Install