Fix up Makefiles so make distcheck works again (out of tree builds and remove generat...

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

diff --git a/varnish-cache/etc/Makefile.am b/varnish-cache/etc/Makefile.am
index b8bd5de74c7bac9522cee8cc693f18b71d8fd415..22047a6a970561f62a0740e5f3988637d8519d6c 100644 (file)
--- a/varnish-cache/etc/Makefile.am
+++ b/varnish-cache/etc/Makefile.am
@@ -4,7 +4,7 @@ EXTRA_DIST = zope-plone.vcl
 
 dist_data_DATA = default.vcl
 
-default.vcl:   ../bin/varnishd/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\
 man page for details on VCL syntax and semantics.\n\
 \n\
@@ -19,6 +19,6 @@ backend default {\n\
 Below is a commented-out copy of the default VCL logic.  If you\n\
 redefine any of these subroutines, the built-in logic will be\n\
 appended to your code.\n" > tmp.vcl
-       sed -n '/vcl_recv/,$$p' ../bin/varnishd/default.vcl >> tmp.vcl
+       sed -n '/vcl_recv/,$$p' $(top_srcdir)/bin/varnishd/default.vcl >> tmp.vcl
        sed 's/^\(.*\)$$/#\1/' tmp.vcl > default.vcl
        rm tmp.vcl

diff --git a/varnish-cache/man/Makefile.am b/varnish-cache/man/Makefile.am
index e532b16fa3c9b4d21097d9b8576f6320b77d1586..02338b8f821f2cec58065c3d30373f68c2ec20da 100644 (file)
--- a/varnish-cache/man/Makefile.am
+++ b/varnish-cache/man/Makefile.am
@@ -1,8 +1,11 @@
 # $Id$
 
+EXTRA_DIST = vcl.7so
+DISTCLEANFILES = vcl.7 default.vcl
+
 dist_man_MANS = vcl.7
 
 vcl.7: vcl.7so default.vcl
        soelim $< > $@
-default.vcl:   ../bin/varnishd/default.vcl
+default.vcl:   $(top_srcdir)/bin/varnishd/default.vcl
        sed -n '/vcl_recv/,$$w $@' $<