r3597 - in branches/2.0/varnish-cache: . lib/libvcl

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-05 11:07:47 +0100 (Thu, 05 Feb 2009)
New Revision: 3597

Modified:
   branches/2.0/varnish-cache/configure.ac
   branches/2.0/varnish-cache/lib/libvcl/Makefile.am
Log:
Merre r3360: 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.



Modified: branches/2.0/varnish-cache/configure.ac
===================================================================
--- branches/2.0/varnish-cache/configure.ac	2009-02-05 10:04:12 UTC (rev 3596)
+++ branches/2.0/varnish-cache/configure.ac	2009-02-05 10:07:47 UTC (rev 3597)
@@ -232,7 +232,7 @@
 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.

Modified: branches/2.0/varnish-cache/lib/libvcl/Makefile.am
===================================================================
--- branches/2.0/varnish-cache/lib/libvcl/Makefile.am	2009-02-05 10:04:12 UTC (rev 3596)
+++ branches/2.0/varnish-cache/lib/libvcl/Makefile.am	2009-02-05 10:07:47 UTC (rev 3597)
@@ -29,10 +29,10 @@
 	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