From: tfheen <tfheen@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Thu, 7 Aug 2008 08:56:01 +0000 (+0000)
Subject: Fix up Makefiles so make distcheck works again (out of tree builds and remove generat... 
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0de385238d24ff09386e74d3a978753115537ed6;p=varnish

Fix up Makefiles so make distcheck works again (out of tree builds and remove generated files on distclean)


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 b8bd5de7..22047a6a 100644
--- 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 e532b16f..02338b8f 100644
--- 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 $@' $<