From: tfheen <tfheen@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Thu, 6 Nov 2008 11:45:45 +0000 (+0000)
Subject: Fix up tclsh invocation (again)
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98629543a6161cb4a145a2970a6acf6dfd698b43;p=varnish

Fix up tclsh invocation (again)

Move the || true bit of invoking tclsh to the Makefile, since
missing would otherwise not pass the file name to tclsh.

Thanks to des for spotting this.


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

diff --git a/varnish-cache/configure.ac b/varnish-cache/configure.ac
index 23ed252f..194b3d5b 100644
--- a/varnish-cache/configure.ac
+++ b/varnish-cache/configure.ac
@@ -232,7 +232,7 @@ fi
 AM_MISSING_HAS_RUN
 AC_CHECK_PROGS(TCLSH, [tclsh tclsh8.4 tclsh8.5], :)
 if test "$TCLSH" = :; then
-  TCLSH="${am_missing_run}tclsh || true"
+  TCLSH="${am_missing_run}tclsh"
 fi
 
 # Solaris defines SO_{RCV,SND}TIMEO, but does not implement them.
diff --git a/varnish-cache/lib/libvcl/Makefile.am b/varnish-cache/lib/libvcl/Makefile.am
index 3d5b475c..1c93738e 100644
--- a/varnish-cache/lib/libvcl/Makefile.am
+++ b/varnish-cache/lib/libvcl/Makefile.am
@@ -29,10 +29,10 @@ EXTRA_DIST = vcc_gen_obj.tcl \
 	vcc_gen_fixed_token.tcl
 
 $(srcdir)/vcc_obj.c: $(srcdir)/vcc_gen_obj.tcl
-	cd $(srcdir) && @TCLSH@ vcc_gen_obj.tcl
+	cd $(srcdir) && @TCLSH@ vcc_gen_obj.tcl || true
 
 $(srcdir)/vcc_fixed_token.c: $(srcdir)/vcc_gen_fixed_token.tcl $(top_srcdir)/include/vcl.h $(top_srcdir)/include/vrt.h $(top_srcdir)/include/vrt_obj.h
-	cd $(srcdir) && @TCLSH@ vcc_gen_fixed_token.tcl
+	cd $(srcdir) && @TCLSH@ vcc_gen_fixed_token.tcl || true
 
 $(srcdir)/vcc_token_defs.h: $(srcdir)/vcc_gen_fixed_token.tcl $(top_srcdir)/include/vcl.h $(top_srcdir)/include/vrt.h $(top_srcdir)/include/vrt_obj.h
-	cd $(srcdir) && @TCLSH@ vcc_gen_fixed_token.tcl
+	cd $(srcdir) && @TCLSH@ vcc_gen_fixed_token.tcl || true