[master] 5ec2bb0 Get rid of temporary intermediate file

Tollef Fog Heen tfheen at varnish-cache.org
Wed Mar 16 11:39:41 CET 2011


commit 5ec2bb09c50629eafaabc9f6d6f43ae145e4f254
Author: Tollef Fog Heen <tfheen at varnish-software.com>
Date:   Wed Mar 16 11:39:14 2011 +0100

    Get rid of temporary intermediate file
    
    Simplify generation of default.vcl somewhat.

diff --git a/etc/Makefile.am b/etc/Makefile.am
index a250571..24faf56 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -6,7 +6,7 @@ DISTCLEANFILES = default.vcl
 dist_varnishconf_DATA = default.vcl
 
 default.vcl:	$(top_srcdir)/bin/varnishd/default.vcl
-	@printf "This is a basic VCL configuration file for varnish.  See the vcl(7)\n\
+	( printf "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\
 Default backend definition.  Set this to point to your content\n\
@@ -19,7 +19,6 @@ backend default {\n\
 \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' $(top_srcdir)/bin/varnishd/default.vcl >> tmp.vcl
-	@sed 's/^\(.*\)$$/# \1/' tmp.vcl > default.vcl
-	@rm tmp.vcl
+appended to your code.\n" ; \
+	sed -n '/vcl_recv/,$$p' $(top_srcdir)/bin/varnishd/default.vcl ) | \
+	sed 's/^\(.*\)$$/# \1/' > default.vcl



More information about the varnish-commit mailing list