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

[d_pocock at users.sourceforge.net]

Revision: 16457
          http://gar.svn.sourceforge.net/gar/?rev=16457&view=rev
Author:   d_pocock
Date:     2011-12-11 05:41:47 +0000 (Sun, 11 Dec 2011)
Log Message:
-----------
ganglia: correct dwoo directory packaging

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

Modified: csw/mgar/pkg/ganglia/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ganglia/trunk/Makefile	2011-12-11 05:06:35 UTC (rev 16456)
+++ csw/mgar/pkg/ganglia/trunk/Makefile	2011-12-11 05:41:47 UTC (rev 16457)
@@ -187,11 +187,11 @@
 PKGFILES_CSWgangliagmetad += /etc/opt/csw/ganglia/gmetad.conf.CSW
 PKGFILES_CSWgangliagmetad += /etc/opt/csw/init.d/cswgmetad
 PKGFILES_CSWgangliagmetad += /var/opt/csw/ganglia/rrds
-PKGFILES_CSWgangliagmetad += /var/opt/csw/ganglia/dwoo
 PKGFILES_CSWgangliagmetad += /opt/csw/share/man/man1/gmetad.1
 
 PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.*
 PKGFILES_CSWgangliaweb += /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW
+PKGFILES_CSWgangliaweb += /var/opt/csw/ganglia/dwoo
 
 PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf
 PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf
@@ -207,10 +207,12 @@
 
 PROTOTYPE_FILTER_CSWgangliagmetad = awk '\
 $$$$3 ~ /\/var\/opt\/csw\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \
+{ print }'
+
+PROTOTYPE_FILTER_CSWgangliaweb = awk '\
 $$$$3 ~ /\/var\/opt\/csw\/ganglia\/dwoo/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \
 { print }'
 
-
 #ARCHALL_CSWganglia-dev = 1
 ARCHALL_CSWgangliaweb = 1
 ARCHALL_CSWgangliamodpython = 1
@@ -252,6 +254,7 @@
 	@rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf.CSW
 endif
 	@ginstall -d $(DESTDIR)/var/opt/csw/ganglia/rrds
+	@ginstall -d $(DESTDIR)/var/opt/csw/ganglia/dwoo
 	@ginstall -D $(WORKSRC)/gmond/gmond.conf.5 $(DESTDIR)$(mandir)/man5/gmond.conf.5
 	@ginstall -D $(WORKSRC)/mans/gmetad.1 $(DESTDIR)$(mandir)/man1/gmetad.1
 	@ginstall -D $(WORKSRC)/mans/gmond.1 $(DESTDIR)$(mandir)/man1/gmond.1

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