Install default.vcl to ${sysconfdir}/varnish, not ${datadir}

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3092 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/configure.ac b/varnish-cache/configure.ac
index ee6ed332802b40a0b63b944af1ff03fbdd6395f9..45f57586378853f1bf75c3c91ec27aa370a3b755 100644 (file)
--- a/varnish-cache/configure.ac
+++ b/varnish-cache/configure.ac
@@ -262,6 +262,9 @@ fi
 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
 

diff --git a/varnish-cache/etc/Makefile.am b/varnish-cache/etc/Makefile.am
index af121b14b124a59ce40b2a01695dd4ac7b320321..548efff4bf1fb770b6ee0d29024553e6d56ba4eb 100644 (file)
--- a/varnish-cache/etc/Makefile.am
+++ b/varnish-cache/etc/Makefile.am
@@ -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\