Rename some of the default.vcls we have to something more sensible

Fixes #291

diff --git a/varnish-cache/bin/varnishd/Makefile.am b/varnish-cache/bin/varnishd/Makefile.am
index d4409a32fb91de0438f6927b2a96c084470c0ca0..d6056c6a2284114c3ddc845ddbf712feee93ca05 100644 (file)
--- a/varnish-cache/bin/varnishd/Makefile.am
+++ b/varnish-cache/bin/varnishd/Makefile.am
@@ -82,14 +82,14 @@ varnishd_LDADD = \
        @JEMALLOC_LDADD@ \
        ${DL_LIBS} ${PTHREAD_LIBS} ${NET_LIBS} ${LIBM} ${LIBUMEM}
 
-EXTRA_DIST = default.vcl
+EXTRA_DIST = embed-default.vcl
 DISTCLEANFILES = default_vcl.h
 
 #
 # Turn the default.vcl file into a C-string we can include in the program.
 #
-default_vcl.h: default.vcl Makefile
-       sed -e 's/"/\\"/g' -e 's/$$/\\n"/' -e 's/^/ "/' $(srcdir)/default.vcl > $@
+default_vcl.h: embed-default.vcl Makefile
+       sed -e 's/"/\\"/g' -e 's/$$/\\n"/' -e 's/^/ "/' $(srcdir)/embed-default.vcl > $@
 
 # Explicitly record dependency
 mgt_vcc.c:     default_vcl.h

diff --git a/varnish-cache/etc/Makefile.am b/varnish-cache/etc/Makefile.am
index 600dae57d43cf63ff82c38618784fc50ce6e0c5a..29c512bdf7d9e76a6fd46c5bc7ea699c405615d1 100644 (file)
--- a/varnish-cache/etc/Makefile.am
+++ b/varnish-cache/etc/Makefile.am
@@ -2,7 +2,7 @@
 
 EXTRA_DIST = zope-plone.vcl
 
-dist_varnishconf_DATA = default.vcl
+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\

diff --git a/varnish-cache/man/Makefile.am b/varnish-cache/man/Makefile.am
index f77b8d0a679d65345259b667d9b257889632021b..cde22f6d28808f4a9f7cf125e1ec9ba0926e6efc 100644 (file)
--- a/varnish-cache/man/Makefile.am
+++ b/varnish-cache/man/Makefile.am
@@ -1,11 +1,11 @@
 # $Id$
 
 EXTRA_DIST = vcl.7so
-DISTCLEANFILES = vcl.7 default.vcl
+DISTCLEANFILES = vcl.7 default.man-include.vcl
 
 dist_man_MANS = vcl.7
 
-vcl.7: vcl.7so default.vcl Makefile
+vcl.7: vcl.7so default.man-include.vcl Makefile
        soelim $(srcdir)/vcl.7so > $@
-default.vcl:   $(top_srcdir)/bin/varnishd/default.vcl Makefile
+default.man-include.vcl:       $(top_srcdir)/bin/varnishd/default.vcl Makefile
        sed -n '/vcl_recv/,$$p' $(top_srcdir)/bin/varnishd/default.vcl > $@

diff --git a/varnish-cache/man/vcl.7so b/varnish-cache/man/vcl.7so
index 7e815b056c35ee3a8bf0d2abf84bfb47be171d85..8ceac043fa9d67fedccf75c6b1d8476e1da2f031 100644 (file)
--- a/varnish-cache/man/vcl.7so
+++ b/varnish-cache/man/vcl.7so
@@ -580,7 +580,7 @@ backend default {
     .port = "http";
 }
 
-.so default.vcl
+.so default.man-include.vcl
 .Ed
 .Pp
 The following example shows how to support multiple sites running on