r3069 - in trunk/varnish-cache: etc man
tfheen at projects.linpro.no
tfheen at projects.linpro.no
Thu Aug 7 10:56:02 CEST 2008
Author: tfheen
Date: 2008-08-07 10:56:01 +0200 (Thu, 07 Aug 2008)
New Revision: 3069
Modified:
trunk/varnish-cache/etc/Makefile.am
trunk/varnish-cache/man/Makefile.am
Log:
Fix up Makefiles so make distcheck works again (out of tree builds and remove generated files on distclean)
Modified: trunk/varnish-cache/etc/Makefile.am
===================================================================
--- trunk/varnish-cache/etc/Makefile.am 2008-08-06 14:29:27 UTC (rev 3068)
+++ trunk/varnish-cache/etc/Makefile.am 2008-08-07 08:56:01 UTC (rev 3069)
@@ -4,7 +4,7 @@
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 @@
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
Modified: trunk/varnish-cache/man/Makefile.am
===================================================================
--- trunk/varnish-cache/man/Makefile.am 2008-08-06 14:29:27 UTC (rev 3068)
+++ trunk/varnish-cache/man/Makefile.am 2008-08-07 08:56:01 UTC (rev 3069)
@@ -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 $@' $<
More information about the varnish-commit
mailing list