From c70c864a76196f4194db131c77f8fe80124d2a0d Mon Sep 17 00:00:00 2001 From: tfheen Date: Thu, 14 Aug 2008 06:32:15 +0000 Subject: [PATCH] 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 --- varnish-cache/configure.ac | 3 +++ varnish-cache/etc/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/varnish-cache/configure.ac b/varnish-cache/configure.ac index ee6ed332..45f57586 100644 --- 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 af121b14..548efff4 100644 --- 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\ -- 2.39.5