SF.net SVN: gar:[23722] csw/mgar/pkg/squid/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 23722
          http://sourceforge.net/p/gar/code/23722
Author:   dmichelsen
Date:     2014-05-28 14:47:35 +0000 (Wed, 28 May 2014)
Log Message:
-----------
squid/trunk: Do not ship .default config files any more, we have .CSW, also preserve errorpage.css

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

Modified: csw/mgar/pkg/squid/trunk/Makefile
===================================================================
--- csw/mgar/pkg/squid/trunk/Makefile	2014-05-28 14:39:48 UTC (rev 23721)
+++ csw/mgar/pkg/squid/trunk/Makefile	2014-05-28 14:47:35 UTC (rev 23722)
@@ -123,6 +123,7 @@
 SAMPLECONF = squid.conf
 SAMPLECONF += cachemgr.conf
 SAMPLECONF += mime.conf
+SAMPLECONF += errorpage.css
 USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup
 
 PROTOTYPE_MODIFIERS      = varuser
@@ -140,7 +141,7 @@
 REINPLACE_WITH_conf = $(sysconfdir)/$(NAME)/
 REINPLACE_FILES_conf += helpers/basic_auth/MSNT/msntauth.conf.default
 
-EXTRA_MERGE_EXCLUDE_FILES += .*/msntauth\.conf\.default
+EXTRA_MERGE_EXCLUDE_FILES += .*\.default
 
 include gar/category.mk
 

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