# HG changeset patch
# User jwe
# Date 1185391437 0
# Node ID 18b7ab1ad68bfc323219a2de35e2a61456c57cab
# Parent  5b00586ccd27b1041ea612f4fdce9851cad33aad
[project @ 2007-07-25 19:23:26 by jwe]

diff -r 5b00586ccd27 -r 18b7ab1ad68b dlfcn/Makefile.in
--- a/dlfcn/Makefile.in	Wed Jul 25 15:49:17 2007 +0000
+++ b/dlfcn/Makefile.in	Wed Jul 25 19:23:57 2007 +0000
@@ -26,7 +26,7 @@
 
 MAKEDEPS := $(SOURCES:.c=.d)
 
-DISTFILES := $(addprefix $srcdir)/, $(SOURCES) $(INCLUDES) README dl.exp Makefile.in ftp-site)
+DISTFILES := $(addprefix $(srcdir)/, $(SOURCES) $(INCLUDES) README dl.exp Makefile.in ftp-site)
 
 all: libdlfcn.a
 .PHONY: all
diff -r 5b00586ccd27 -r 18b7ab1ad68b doc/ChangeLog
--- a/doc/ChangeLog	Wed Jul 25 15:49:17 2007 +0000
+++ b/doc/ChangeLog	Wed Jul 25 19:23:57 2007 +0000
@@ -1,3 +1,7 @@
+2007-07-25  John W. Eaton  <jwe@octave.org>
+
+	* interpreter/Makefile.in (run-octave): Don't set DISPLAY.
+
 2007-07-25  David Bateman  <dbateman@free.fr>
 
 	* Makefile.in, faq/Makefile.in, interpreter/Makwfile.in, 
diff -r 5b00586ccd27 -r 18b7ab1ad68b doc/faq/Makefile.in
--- a/doc/faq/Makefile.in	Wed Jul 25 15:49:17 2007 +0000
+++ b/doc/faq/Makefile.in	Wed Jul 25 19:23:57 2007 +0000
@@ -24,7 +24,7 @@
 
 FORMATTED := Octave-FAQ.info Octave-FAQ.dvi Octave-FAQ.ps Octave-FAQ.pdf
 
-DISTFILES := $(addprefix $srcdir)/, Makefile.in $(TEXINFO) $(FORMATTED))
+DISTFILES := $(addprefix $(srcdir)/, Makefile.in $(TEXINFO) $(FORMATTED))
 
 DISTDIRS := HTML
 
@@ -86,5 +86,8 @@
 
 dist: all
 	ln $(DISTFILES) ../../`cat ../../.fname`/doc/faq
-	for dir in $(DISTDIRS); do ln ../../doc/faq/$$dir ../../`cat ../../.fname`/doc/faq/$$dir; done
+	for dir in $(DISTDIRS); do \
+	  mkdir ../../`cat ../../.fname`/doc/faq/$$dir; \
+	  ln ../../doc/faq/$$dir/* ../../`cat ../../.fname`/doc/faq/$$dir; \
+	done
 .PHONY: dist
diff -r 5b00586ccd27 -r 18b7ab1ad68b doc/interpreter/Makefile.in
--- a/doc/interpreter/Makefile.in	Wed Jul 25 15:49:17 2007 +0000
+++ b/doc/interpreter/Makefile.in	Wed Jul 25 19:23:57 2007 +0000
@@ -97,8 +97,9 @@
 MAN_SRC := $(addsuffix .1, $(MAN_BASE))
 
 # FIXME -- need to include generated figures here...
-DISTFILES = $(addprefix $(srcdir)/, Makefile.in contributors.in mkcontrib.awk dir \
-  munge-texi.cc $(MAN_SRC) $(SOURCES) $(TEXINFO_SOURCE)) $(FORMATTED) $(IMAGES)
+DISTFILES = $(addprefix $(srcdir)/, Makefile.in contributors.in \
+  mkcontrib.awk dir  munge-texi.cc $(MAN_SRC) $(SOURCES) $(MAIN_TEXINFO)) \
+  $(SUB_TEXINFO) contributors.texi $(FORMATTED) $(IMAGES)
 
 DISTDIRS = HTML
 
@@ -202,12 +203,10 @@
 	fi
 	cp $(filter-out html-dir, $<) HTML
 
-## Unset DISPLAY here to avoid problems with the -title option for
-## gnuplot (it doesn't work if we are calling pgnuplot).  Sleep for
-## a second to allow gnuplot to finish writing its output before
-## Octave exits.
+## Sleep for a second after plotting to allow gnuplot to finish
+## writing its output before Octave exits.
 define run-octave
-  DISPLAY= $(TOPDIR)/run-octave -f -q -H -p $(srcdir) \
+  $(TOPDIR)/run-octave -f -q -H -p $(srcdir) \
     --eval "$(notdir $(basename $<)) ('$(notdir $(basename $@))', '$(patsubst .%,%, $(suffix $@))'); sleep (1);"
 endef
 
@@ -306,6 +305,9 @@
 
 dist: clean-texi all
 	ln $(DISTFILES) ../../`cat ../../.fname`/doc/interpreter
-	for dir in $(DISTDIRS); do ln ../../doc/interpreter/$$dir ../../`cat ../../.fname`/doc/interpreter/$$dir; done
+	for dir in $(DISTDIRS); do \
+	  mkdir ../../`cat ../../.fname`/doc/interpreter/$$dir; \
+	  ln ../../doc/interpreter/$$dir/* ../../`cat ../../.fname`/doc/interpreter/$$dir; \
+	done
 	for dir in $(DISTSUBDIRS); do mkdir ../../`cat ../../.fname`/doc/interpreter/$$dir; $(MAKE) -C $$dir $@; done
 .PHONY: dist
diff -r 5b00586ccd27 -r 18b7ab1ad68b doc/liboctave/Makefile.in
--- a/doc/liboctave/Makefile.in	Wed Jul 25 15:49:17 2007 +0000
+++ b/doc/liboctave/Makefile.in	Wed Jul 25 19:23:57 2007 +0000
@@ -105,5 +105,8 @@
 
 dist: all
 	ln $(DISTFILES) ../../`cat ../../.fname`/doc/liboctave
-	for dir in $(DISTDIRS); do ln ../../doc/liboctave/$$dir ../../`cat ../../.fname`/doc/liboctave/$$dir; done
+	for dir in $(DISTDIRS); do \
+	  mkdir ../../`cat ../../.fname`/doc/liboctave/$$dir; \
+	  ln ../../doc/liboctave/$$dir/* ../../`cat ../../.fname`/doc/liboctave/$$dir; \
+	done
 .PHONY: dist
diff -r 5b00586ccd27 -r 18b7ab1ad68b octMakefile.in
--- a/octMakefile.in	Wed Jul 25 15:49:17 2007 +0000
+++ b/octMakefile.in	Wed Jul 25 19:23:57 2007 +0000
@@ -174,7 +174,7 @@
 	echo octave-$(version) > .fname
 	rm -rf `cat .fname`
 	mkdir `cat .fname`
-	ln $(addprefix, $(srcdir)/, $(DISTFILES)) `cat .fname`
+	ln $(addprefix $(srcdir)/, $(DISTFILES)) `cat .fname`
 	ln $(BUILT_DISTFILES) `cat .fname`
 	for dir in $(DISTSUBDIRS); do \
 	  mkdir `cat .fname`/$$dir; \
diff -r 5b00586ccd27 -r 18b7ab1ad68b src/ChangeLog
--- a/src/ChangeLog	Wed Jul 25 15:49:17 2007 +0000
+++ b/src/ChangeLog	Wed Jul 25 19:23:57 2007 +0000
@@ -1,3 +1,7 @@
+2007-07-25  John W. Eaton  <jwe@octave.org>
+
+	* pt-bp.h (MAYBE_DO_BREAKPOINT): Rename fcn to curr_fcn.
+
 2007-07-25  David Bateman  <dbateman@free.fr>
 	
 	* Makefile.in: 	Adjust DISTFILES to allow out of tree "make dist" 
diff -r 5b00586ccd27 -r 18b7ab1ad68b src/pt-bp.h
--- a/src/pt-bp.h	Wed Jul 25 15:49:17 2007 +0000
+++ b/src/pt-bp.h	Wed Jul 25 19:23:57 2007 +0000
@@ -160,12 +160,12 @@
 #define MAYBE_DO_BREAKPOINT \
   do \
     { \
-      octave_function *fcn = octave_call_stack::current (); \
+      octave_function *curr_fcn = octave_call_stack::current (); \
  \
       if (octave_debug_on_interrupt_state \
 	  || (tree::break_next && tree::last_line == 0) \
 	  || (tree::break_next \
-	      && fcn == tree::break_function \
+	      && curr_fcn == tree::break_function \
 	      && tree::last_line != line ()) \
 	  || is_breakpoint ()) \
         { \
@@ -173,8 +173,8 @@
  \
           tree::break_next = false; \
  \
-          if (fcn) \
-            octave_stdout << fcn->name () << ": ";  \
+          if (curr_fcn) \
+            octave_stdout << curr_fcn->name () << ": ";  \
  \
           octave_stdout << "line " << line () << ", " \
 			<< "column " << column () \