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

[skayser at users.sourceforge.net]

Revision: 7942
          http://gar.svn.sourceforge.net/gar/?rev=7942&view=rev
Author:   skayser
Date:     2010-01-10 13:30:25 +0000 (Sun, 10 Jan 2010)

Log Message:
-----------
dante: fix SAMPLECONF paths

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

Modified: csw/mgar/pkg/dante/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dante/trunk/Makefile	2010-01-10 13:25:10 UTC (rev 7941)
+++ csw/mgar/pkg/dante/trunk/Makefile	2010-01-10 13:30:25 UTC (rev 7942)
@@ -61,8 +61,8 @@
 # UPNP support requires miniupnp from http://miniupnp.free.fr/
 CONFIGURE_ARGS += --without-upnp
 
-SAMPLECONF  = $(sysconfdir)/socks.conf.CSW
-SAMPLECONF += $(sysconfdir)/sockd.conf.CSW
+SAMPLECONF  = $(sysconfdir)/socks.conf
+SAMPLECONF += $(sysconfdir)/sockd.conf
 INITSMF     = /etc/opt/csw/init\.d/cswdante
 
 EXTRA_PAX_ARGS = '-s,NEWS$$,changelog,p'
@@ -91,7 +91,7 @@
 	cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST)
 
 	ginstall -d $(DESTDIR)$(sysconfdir)
-	cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir)
+	cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir)/socks.conf
 	@$(MAKECOOKIE)
 
 
@@ -110,7 +110,7 @@
 		$(DESTDIR)/etc/opt/csw/init.d/cswdante
 
 	ginstall -d $(DESTDIR)$(sysconfdir)
-	cp $(FILEDIR)/sockd.conf.CSW $(DESTDIR)$(sysconfdir)
+	cp $(FILEDIR)/sockd.conf.CSW $(DESTDIR)$(sysconfdir)/sockd.conf
 
 	# This is where sockd.log goes, ref. $(FILEDIR)/sockd.conf.CSW
 	ginstall -d $(DESTDIR)$(localstatedir)/dante


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