[csw-devel] SF.net SVN: gar:[15700] csw/mgar/pkg/squid/branches/squid3/Makefile

wilbury at users.sourceforge.net wilbury at users.sourceforge.net
Wed Sep 21 12:23:02 CEST 2011


Revision: 15700
          http://gar.svn.sourceforge.net/gar/?rev=15700&view=rev
Author:   wilbury
Date:     2011-09-21 10:23:02 +0000 (Wed, 21 Sep 2011)
Log Message:
-----------
squid/branches/squid3: Fix ugfiles

Modified Paths:
--------------
    csw/mgar/pkg/squid/branches/squid3/Makefile

Modified: csw/mgar/pkg/squid/branches/squid3/Makefile
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/Makefile	2011-09-21 10:10:57 UTC (rev 15699)
+++ csw/mgar/pkg/squid/branches/squid3/Makefile	2011-09-21 10:23:02 UTC (rev 15700)
@@ -26,8 +26,6 @@
 PRESERVECONF = /etc/opt/csw/$(NAME)/squid.conf
 PRESERVECONF = /etc/opt/csw/$(NAME)/mime.conf
 
-CLASSES = cswusergroup none cswmigrateconf cswinitsmf
-
 MIGRATE_SOURCE_DIR = /opt/csw/etc
 MIGRATE_DEST_DIR = /etc/opt/csw/$(NAME)
 MIGRATE_FILES  = cachemgr.conf
@@ -81,13 +79,13 @@
 EXTRA_LINKER_FLAGS += -norunpath
 
 PROTOTYPE_MODIFIERS      = varuser
-PROTOTYPE_FILES_varuser  = /var/opt/csw/$(NAME)/cache
-PROTOTYPE_FILES_varuser += /var/opt/csw/$(NAME)/logs
+PROTOTYPE_FILES_varuser  = \/var\/opt\/csw\/$(NAME)\/cache
+PROTOTYPE_FILES_varuser += \/var\/opt\/csw\/$(NAME)\/logs
+PROTOTYPE_CLASS_varuser  = ugfiles
 PROTOTYPE_USER_varuser   = $(NAME)
 PROTOTYPE_GROUP_varuser  = $(NAME)
 
-USERGROUP = /var/opt/csw/$(NAME)/cache
-USERGROUP += /var/opt/csw/$(NAME)/logs
+USERGROUP = /etc/opt/csw/pkg/$(NAME)/cswusergroup
 
 include gar/category.mk
 
@@ -101,7 +99,8 @@
 	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	ginstall -d $(DESTDIR)/var/opt/csw/$(NAME)/logs
 	ginstall -d $(DESTDIR)/var/opt/csw/$(NAME)/cache
+	ginstall -d $(DESTDIR)/etc/opt/csw/pkg/$(NAME)
 	ginstall -m 755 $(DOWNLOADDIR)/cswsquid $(DESTDIR)/etc/opt/csw/init.d/csw$(NAME)
-	ginstall -m 755 $(DOWNLOADDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/$(NAME)/cswusergroup
+	ginstall -m 644 $(DOWNLOADDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/$(NAME)/cswusergroup
 	@$(MAKECOOKIE)
 

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



More information about the devel mailing list