[csw-devel] SF.net SVN: gar:[16301] csw/mgar/pkg/ganglia/trunk/Makefile

[d_pocock at users.sourceforge.net]

Revision: 16301
          http://gar.svn.sourceforge.net/gar/?rev=16301&view=rev
Author:   d_pocock
Date:     2011-11-27 02:54:31 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
ganglia: more config file fixes

Modified Paths:
--------------
    csw/mgar/pkg/ganglia/trunk/Makefile

Modified: csw/mgar/pkg/ganglia/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ganglia/trunk/Makefile	2011-11-27 02:20:53 UTC (rev 16300)
+++ csw/mgar/pkg/ganglia/trunk/Makefile	2011-11-27 02:54:31 UTC (rev 16301)
@@ -138,19 +138,19 @@
 ETCGANGLIA = $(sysconfdir)
 
 PKGFILES_CSWganglia = 
-PKGFILES_CSWgangliaagent = .*/gmond.conf.CSW /etc/opt/csw/ganglia/conf.d/* .*/sbin/gmond .*/bin/gmetric $(libdir)/ganglia/mod*.so /etc/opt/csw/init.d/cswgmond
+PKGFILES_CSWgangliaagent = .*/gmond.conf.CSW /etc/opt/csw/ganglia/conf.d/modgstatus.conf.CSW .*/sbin/gmond .*/bin/gmetric /opt/csw/lib/ganglia/mod*.so /etc/opt/csw/init.d/cswgmond
 PKGFILES_CSWlibganglia0 += $(call baseisadirs,$(libdir),libganglia-3\.1\.7\.so\.0\.0\.0)
 PKGFILES_CSWlibganglia0 += $(call baseisadirs,$(libdir),libganglia-3\.1\.7\.so\.0(\.\d+)*)
 CHECKPKG_OVERRIDES_CSWlibganglia0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libganglia-3.1.7.so.0.0.0|soname=libganglia-3.1.7.so.0|pkgname=CSWlibganglia0|expected=CSWlibganglia3-1-7-0
 PKGFILES_CSWgangliamodpython = .*python.*
 PKGFILES_CSWganglia-dev = .*/include/.*.h .*/bin/ganglia-config $(libdir)/libganglia.so
 PKGFILES_CSWgangliagmetad = .*/sbin/gmetad .*/gmetad.conf.CSW /var/opt/csw/ganglia/rrds /etc/opt/csw/init.d/cswgmetad
-PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.*
+PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW
 
-PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW
+PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf
 PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf
 PRESERVECONF += /etc/opt/csw/ganglia/gmetad.conf
-PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modgstatus.conf.CSW
+PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modgstatus.conf
 PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modpython.conf.CSW
 PRESERVECONF += $(WWWGANGLIA)/conf.php
 
@@ -193,6 +193,7 @@
 #		$(DESTDIR)$(ETCGANGLIA)/gmond.conf
 	@ginstall -D $(FILEDIR)/gmetad.conf \
 		$(DESTDIR)$(ETCGANGLIA)/gmetad.conf.CSW
+	@rm -rf $(DESTDIR)$(ETCGANGLIA)/gmetad.conf
 	@cd $(WORKSRC)/gmond/modules/conf.d; \
 		for CONF_FILE in *.conf ; \
 		do cp -R "$${CONF_FILE}" $(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.