r3092 - in trunk/varnish-cache: . etc

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2008-08-14 08:32:15 +0200 (Thu, 14 Aug 2008)
New Revision: 3092

Modified:
   trunk/varnish-cache/configure.ac
   trunk/varnish-cache/etc/Makefile.am
Log:
Install default.vcl to ${sysconfdir}/varnish, not ${datadir}


Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac	2008-08-13 06:54:14 UTC (rev 3091)
+++ trunk/varnish-cache/configure.ac	2008-08-14 06:32:15 UTC (rev 3092)
@@ -262,6 +262,9 @@
 VARNISH_STATE_DIR='${localstatedir}/varnish'
 AC_SUBST(VARNISH_STATE_DIR)
 
+# Default configuration directory.
+varnishconfdir='${sysconfdir}/varnish'
+AC_SUBST(varnishconfdir)
 # Now that we're done using the compiler to look for functions and
 # libraries, set CFLAGS to what we want them to be for our own code
 

Modified: trunk/varnish-cache/etc/Makefile.am
===================================================================
--- trunk/varnish-cache/etc/Makefile.am	2008-08-13 06:54:14 UTC (rev 3091)
+++ trunk/varnish-cache/etc/Makefile.am	2008-08-14 06:32:15 UTC (rev 3092)
@@ -2,7 +2,7 @@
 
 EXTRA_DIST = zope-plone.vcl
 
-dist_data_DATA = default.vcl
+dist_varnishconf_DATA = default.vcl
 
 default.vcl:	$(top_srcdir)/bin/varnishd/default.vcl
 	@echo -e "This is a basic VCL configuration file for varnish.  See the vcl(7)\n\