--- a/doc/interpreter/Makefile.in
+++ b/doc/interpreter/Makefile.in
@@ -190,9 +190,9 @@
 	rm -f Makefile 
 .PHONY: distclean
 
-maintainer-clean: distclean
+maintainer-clean: distclean clean-texi
 	rm -f tags TAGS octave.info octave.info-* octave.dvi octave.ps
-	rm -f octave_*.html $(TEXINFO)
+	rm -f octave_*.html
 .PHONY: maintainer-clean
 
 clean-texi:

--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -202,7 +202,8 @@
 endif
 
 ifeq ($(INCLUDE_LINK_DEPS),true)
-  OCTINTERP_LINK_DEPS = -L../liboctave $(LIBOCTAVE) -L../libcruft $(LIBCRUFT)
+  OCTINTERP_LINK_DEPS = \
+    -L../liboctave $(LIBOCTAVE) -L../libcruft $(LIBCRUFT) $(FLIBS)
   OCT_LINK_DEPS = \
     -L../libcruft $(LIBCRUFT) -L../liboctave $(LIBOCTAVE) \
     -L. $(LIBOCTINTERP) $(BLAS_LIBS) $(FFTW_LIBS) $(FLIBS)

--- a/src/pt-stmt.cc
+++ b/src/pt-stmt.cc
@@ -111,25 +111,32 @@
 	  // or not the expression will take care of binding ans and
 	  // printing the result.
 
+	  // XXX FIXME XXX -- it seems that we should just have to
+	  // call expr->rvalue () and that should take care of
+	  // everything, binding ans as necessary?
+
 	  bool do_bind_ans = false;
 
+	  bool script_file_executed = false;
+
 	  if (expr->is_identifier ())
 	    {
-	      bool script_file_executed = false;
-
 	      tree_identifier *id = static_cast<tree_identifier *> (expr);
 
-	      id->do_lookup (script_file_executed, false);
+	      id->do_lookup (script_file_executed, true);
 
 	      do_bind_ans = id->is_function ();
 	    }
 	  else
 	    do_bind_ans = (! expr->is_assignment_expression ());
 
-	  retval = expr->rvalue (nargout);
+	  if (! script_file_executed)
+	    {
+	      retval = expr->rvalue (nargout);
 
-	  if (do_bind_ans && ! (error_state || retval.empty ()))
-	    bind_ans (retval(0), pf);
+	      if (do_bind_ans && ! (error_state || retval.empty ()))
+		bind_ans (retval(0), pf);
+	    }
 	}
 
       unwind_protect::run ();