Revision: 24814 http://sourceforge.net/p/gar/code/24814 Author: dmichelsen Date: 2015-04-06 20:33:32 +0000 (Mon, 06 Apr 2015) Log Message: ----------- lang-python/carbon/trunk: Lots of relocation
Modified Paths: -------------- csw/mgar/pkg/lang-python/carbon/trunk/Makefile Modified: csw/mgar/pkg/lang-python/carbon/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/carbon/trunk/Makefile 2015-04-06 20:32:29 UTC (rev 24813) +++ csw/mgar/pkg/lang-python/carbon/trunk/Makefile 2015-04-06 20:33:32 UTC (rev 24814) @@ -15,8 +15,11 @@ # PKGFILES is catchall ARCHALL_CSWpy-carbon = 1 -EXTRA_INSTALL_ARGS += --install-data=$(localstatedir)/graphite +CONFDIR = $(sysconfdir)/graphite +STORAGEDIR = $(localstatedir)/graphite +EXTRA_INSTALL_ARGS += --install-data=$(CONFDIR) + # There is no testsuite TEST_SCRIPTS = @@ -30,8 +33,30 @@ CONFIG_FILES += storage-schemas.conf CONFIG_FILES += whitelist.conf -PRESERVECONF += $(foreach F,$(CONFIG_FILES),$(localstatedir)/graphite/conf/$F) +PRESERVECONF += $(add-prefix $(CONFIG_FILES),$(CONFDIR)/) +# GRAPHITE_ROOT - Root directory of the graphite installation. +# Defaults to ../ +# GRAPHITE_CONF_DIR - Configuration directory (where this file lives). +# Defaults to $GRAPHITE_ROOT/conf/ +# GRAPHITE_STORAGE_DIR - Storage directory for whipser/rrd/log/pid files. +# Defaults to $GRAPHITE_ROOT/storage/ +# +# To change other directory paths, add settings to this file. The following +# configuration variables are available with these default values: +# +# STORAGE_DIR = $GRAPHITE_STORAGE_DIR +# LOCAL_DATA_DIR = STORAGE_DIR/whisper/ +# WHITELISTS_DIR = STORAGE_DIR/lists/ +# CONF_DIR = STORAGE_DIR/conf/ +# LOG_DIR = STORAGE_DIR/log/ +# PID_DIR = STORAGE_DIR/ + +REINPLACEMENTS += loc +REINPLACE_MATCH_loc = \#LOCAL_DATA_DIR.* +REINPLACE_WITH_loc = GRAPHITE_ROOT = $(prefix)\nGRAPHITE_CONF_DIR = $(CONFDIR)/conf\nGRAPHITE_STORAGE_DIR = $(STORAGEDIR)/storage\nPID_DIR = /var/run +REINPLACE_FILES_loc += conf/carbon.conf.example + include gar/category.mk post-extract: @@ -39,5 +64,7 @@ @$(MAKECOOKIE) post-install: - cd $(DESTDIR)$(localstatedir)/graphite/conf; $(foreach F,$(CONFIG_FILES),mv $F.example $F.CSW;) + cd $(DESTDIR)$(CONFDIR)/conf; $(foreach F,$(CONFIG_FILES),mv $F.example $F.CSW;) + ginstall -d -m 0755 $(DESTDIR)$(STORAGEDIR) + mv $(DESTDIR)$(CONFDIR)/storage $(DESTDIR)$(STORAGEDIR)/storage @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.