[csw-devel] SF.net SVN: gar:[5712] csw/mgar/pkg/awstats/trunk

[dmichelsen at users.sourceforge.net]

Revision: 5712
          http://gar.svn.sourceforge.net/gar/?rev=5712&view=rev
Author:   dmichelsen
Date:     2009-07-29 16:04:46 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
awstats: Fix install locations

Modified Paths:
--------------
    csw/mgar/pkg/awstats/trunk/Makefile
    csw/mgar/pkg/awstats/trunk/checksums
    csw/mgar/pkg/awstats/trunk/files/CSWawstats.postinstall

Modified: csw/mgar/pkg/awstats/trunk/Makefile
===================================================================
--- csw/mgar/pkg/awstats/trunk/Makefile	2009-07-29 15:30:05 UTC (rev 5711)
+++ csw/mgar/pkg/awstats/trunk/Makefile	2009-07-29 16:04:46 UTC (rev 5712)
@@ -36,6 +36,8 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
+PRESERVECONF = $(prefix)/apache2/etc/extra/httpd-awstats.conf.CSW
+
 ARCHALL = 1
 
 include gar/category.mk
@@ -53,9 +55,14 @@
 		$(DESTDIR)$(sharedstatedir)/www/awstats/htdocs/
 	ginstall -d $(DESTDIR)$(sharedstatedir)/www/awstats/cgi-bin/
 	cp -R $(WORKSRC)/wwwroot/cgi-bin/* \
-			$(DESTDIR)$(sharedstatedir)/www/awstats/cgi-bin/
-	ginstall -d $(DESTDIR)$(prefix)/apache2/share/htdocs
-	ln -s $(sharedstatedir)/www/awstats/htdocs $(DESTDIR)$(prefix)/apache2/share/htdocs/awstats
-	ginstall -d $(DESTDIR)$(prefix)/apache2/share/cgi-bin
-	ln -s $(sharedstatedir)/www/awstats/cgi-bin $(DESTDIR)$(prefix)/apache2/share/cgi-bin/awstats
+		$(DESTDIR)$(sharedstatedir)/www/awstats/cgi-bin/
+
+	ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra/
+	cat $(WORKSRC)/tools/httpd_conf | perl -p -e '\
+		s!/usr/local/awstats/wwwroot/cgi-bin/!$(sharedstatedir)/www/awstats/cgi-bin/!; \
+		s!/usr/local/awstats/wwwroot/!$(sharedstatedir)/www/awstats/htdocs/!; \
+		s!/usr/local/awstats/wwwroot!$(sharedstatedir)/www/awstats/htdocs!;' \
+		> $(DESTDIR)$(prefix)/apache2/etc/extra/httpd-awstats.conf.CSW
+	rm -f $(DESTDIR)$(sharedstatedir)/awstats/httpd_conf
+
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/awstats/trunk/checksums
===================================================================
--- csw/mgar/pkg/awstats/trunk/checksums	2009-07-29 15:30:05 UTC (rev 5711)
+++ csw/mgar/pkg/awstats/trunk/checksums	2009-07-29 16:04:46 UTC (rev 5712)
@@ -1,2 +1,2 @@
-f9ff2a954cfd6cb0937579ed3868bfd6  download/CSWawstats.postinstall
+a6ae0f8a42dd10e41957c29ac78bbc18  download/CSWawstats.postinstall
 fc19dbb8449eccf3300efb30ca3376cb  download/awstats-6.9.tar.gz

Modified: csw/mgar/pkg/awstats/trunk/files/CSWawstats.postinstall
===================================================================
--- csw/mgar/pkg/awstats/trunk/files/CSWawstats.postinstall	2009-07-29 15:30:05 UTC (rev 5711)
+++ csw/mgar/pkg/awstats/trunk/files/CSWawstats.postinstall	2009-07-29 16:04:46 UTC (rev 5712)
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 cat <<EOF
 ___________________________________________________________________________
 The Awstats system has been installed but you must configure


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