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

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


git-svn-id: http://www.varnish-cache.org/svn/trunk@3069 d4fa192b-c00b-0410-8231-f00ffab90ce4

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

man/Makefile.am

 # $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 $@' $<