# HG changeset patch
# User jwe
# Date 1162325439 0
# Node ID c0011bf8f8158d7dcb621561b6e4cc48a52de2d7
# Parent  a1754033bc6c7c775cb75bc03e6a6dd3f1d3e16d
[project @ 2006-10-31 20:08:30 by jwe]

diff --git a/doc/ChangeLog b/doc/ChangeLog
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-29  John W. Eaton  <jwe@octave.org>
+
+	* interpreter/Makefile.in (run-octave): Call it here.
+	* interpreter/sparseimages.m (sparseimages): Don't call sleep here.
+
 2006-10-27  John W. Eaton  <jwe@octave.org>
 
 	* interpreter/Makefile.in (run-octave):
diff --git a/doc/interpreter/Makefile.in b/doc/interpreter/Makefile.in
--- a/doc/interpreter/Makefile.in
+++ b/doc/interpreter/Makefile.in
@@ -147,10 +147,12 @@
 	$(INSTALL_DATA) $(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).
+## 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.
 define run-octave
   DISPLAY= $(TOPDIR)/run-octave -f -q -H -p $(srcdir) \
-    --eval "$(notdir $(basename $<)) ('$(notdir $(basename $@))', '$(patsubst .%,%, $(suffix $@))')"
+    --eval "$(notdir $(basename $<)) ('$(notdir $(basename $@))', '$(patsubst .%,%, $(suffix $@))'); sleep (1);"
 endef
 
 $(SPARSEIMAGES_EPS) $(SPARSEIMAGES_PNG) $(SPARSEIMAGES_TXT): sparseimages.m
diff --git a/doc/interpreter/sparseimages.m b/doc/interpreter/sparseimages.m
--- a/doc/interpreter/sparseimages.m
+++ b/doc/interpreter/sparseimages.m
@@ -1,22 +1,18 @@
-function sparseimages(nm,typ)
+function sparseimages (nm, typ)
   if (! isempty (findstr (octave_config_info ("DEFS"), "HAVE_COLAMD"))
       && ! isempty (findstr (octave_config_info ("DEFS"), "HAVE_CHOLMOD"))
       && ! isempty (findstr (octave_config_info ("DEFS"), "HAVE_UMFPACK")))
-  if (strcmp(typ,"txt"))
-    txtimages (nm, 15, typ);
-  else
-    if (strcmp (nm, "gplot"))
-      gplotimages ("gplot", typ);
-    elseif (strcmp (nm, "grid"))
-      femimages ("grid", typ);
+    if (strcmp(typ,"txt"))
+      txtimages (nm, 15, typ);
     else
-      otherimages (nm, 200, typ);
+      if (strcmp (nm, "gplot"))
+	gplotimages ("gplot", typ);
+      elseif (strcmp (nm, "grid"))
+	femimages ("grid", typ);
+      else
+	otherimages (nm, 200, typ);
+      endif
     endif
-  endif
-  ## Kluge to give gnuplot enough time to process last figure before we
-  ## exit.  Otherwise, Octave will delete the temporary data files when
-  ## it exits and gnuplot will fail...
-  sleep (1);
   else ## There is no sparse matrix implementation available because
        ## of missing libraries, plot sombreros instead
     sombreroimage (nm, typ);
diff --git a/libcruft/ChangeLog b/libcruft/ChangeLog
--- a/libcruft/ChangeLog
+++ b/libcruft/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-31  John W. Eaton  <jwe@octave.org>
+
+	* misc/Makefile.in (INCLUDES): Add oct-dlldefs.h to the list.
+
 2006-10-29  John W. Eaton  <jwe@octave.org>
 
 	* misc/Makefile.in (SPECIAL_INCLUDE): Add oct-dlldefs.h to the list.
diff --git a/libcruft/misc/Makefile.in b/libcruft/misc/Makefile.in
--- a/libcruft/misc/Makefile.in
+++ b/libcruft/misc/Makefile.in
@@ -31,7 +31,7 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
-INCLUDES := f77-fcn.h lo-error.h quit.h
+INCLUDES := f77-fcn.h lo-error.h oct-dlldefs.h quit.h
 
 ifeq ($(SHARED_LIBS), true)
   ifdef CPICFLAG