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 23ed252f8607f87bc2666f3d48e2ed1972e372ce..194b3d5bba3d33d833d92cb419ba0de19aa29f4f 100644 (file)
--- 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 3d5b475c0a6893dd021817ca3e3ee1f425cad76e..1c93738eeee8757e9ac5d63c39aec6b3a9e0e4fb 100644 (file)
--- 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