[csw-devel] SF.net SVN: gar:[5231] csw/mgar/pkg/dante/trunk

[skayser at users.sourceforge.net]

Revision: 5231
          http://gar.svn.sourceforge.net/gar/?rev=5231&view=rev
Author:   skayser
Date:     2009-06-11 13:24:35 +0000 (Thu, 11 Jun 2009)

Log Message:
-----------
dante: have pid location conform with csw standards

Modified Paths:
--------------
    csw/mgar/pkg/dante/trunk/Makefile
    csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante

Modified: csw/mgar/pkg/dante/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dante/trunk/Makefile	2009-06-11 13:07:11 UTC (rev 5230)
+++ csw/mgar/pkg/dante/trunk/Makefile	2009-06-11 13:24:35 UTC (rev 5231)
@@ -52,7 +52,7 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-socks-conf=$(sysconfdir)/socks.conf
 CONFIGURE_ARGS += --with-sockd-conf=$(sysconfdir)/sockd.conf
-CONFIGURE_ARGS += --with-pidfile=/var/opt/csw/run/sockd.pid
+CONFIGURE_ARGS += --with-pidfile=/var/opt/csw/dante/sockd.pid
 
 # Don't bother about the "not found" modules after the ./configure run,
 # they are commercial add-ons (http://www.inet.no/dante/module.html).
@@ -104,6 +104,7 @@
 post-install-dante: DOCS = CREDITS NEWS SUPPORT
 post-install-dante: CSWDOCS = changelog.CSW
 post-install-dante:
+	@ginstall -d $(DESTDIR)/var/opt/csw/dante
 	@ginstall -d $(DOCDEST)/examples
 	@cp $(WORKSRC)/example/sockd*.conf $(DOCDEST)/examples
 	@$(foreach D,$(DOCS),    cp $(WORKSRC)/$(D) $(DOCDEST);)
@@ -112,9 +113,6 @@
 	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	@ginstall -m 0755 $(FILEDIR)/CSWdante.cswdante \
 		$(DESTDIR)/etc/opt/csw/init.d/cswdante
-
-	# /var/opt/csw/run is not in CSWcommon
-	@ginstall -d $(DESTDIR)/var/opt/csw/run
 	@$(MAKECOOKIE)
 
 

Modified: csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante
===================================================================
--- csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante	2009-06-11 13:07:11 UTC (rev 5230)
+++ csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante	2009-06-11 13:24:35 UTC (rev 5231)
@@ -5,7 +5,7 @@
 
 PATH=/usr/bin:/opt/csw/bin:/usr/sbin
 
-PIDFILE=/var/opt/csw/run/sockd.pid
+PIDFILE=/var/opt/csw/dante/sockd.pid
 CONFIG=/opt/csw/etc/sockd.conf
 CONFIG_LOCAL=/etc/opt/csw/etc/sockd.conf
 


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