# HG changeset patch
# User jwe
# Date 948795476 0
# Node ID 9c68cfa263eb77fe46eada35ea68023e9b4efe4f
# Parent  64f8babb7b3de6ae9861569195cdf6b75046425e
[project @ 2000-01-25 10:17:55 by jwe]

diff -r 64f8babb7b3d -r 9c68cfa263eb ChangeLog
--- a/ChangeLog	Tue Jan 25 09:44:17 2000 +0000
+++ b/ChangeLog	Tue Jan 25 10:17:56 2000 +0000
@@ -1,3 +1,8 @@
+2000-01-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* install-octave.in: Exit on any error instead of continuing.
+	Install Octave binary last.
+
 2000-01-24  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* emacs/octave-mod.el (octave-mode-syntax-table):
diff -r 64f8babb7b3d -r 9c68cfa263eb install-octave.in
--- a/install-octave.in	Tue Jan 25 09:44:17 2000 +0000
+++ b/install-octave.in	Tue Jan 25 10:17:56 2000 +0000
@@ -7,6 +7,10 @@
 # University of Wisconsin-Madison
 # Department of Chemical Engineering
 
+# Exit on any error.
+
+set -e
+
 # get version
 version=`cat VERSION 2> /dev/null`
 
@@ -209,22 +213,6 @@
 
 ./mkinstalldirs $DIRS_TO_MAKE
 
-if test "$prefix" = /usr/local
-then
-  echo "installing src/octave as $bindir/octave"
-  cp src/octave $bindir/octave
-  chmod 755 $bindir/octave
-else
-  echo "installing octave-sh as $bindir/octave"
-  sed "s|@OCTAVE_HOME@|$prefix|; s|@LD_LIBRARY_PATH@|$octlibdir|" octave-sh \
-    > $bindir/octave
-  chmod 755 $bindir/octave
-
-  echo "installing src/octave as $bindir/octave.bin"
-  cp src/octave $bindir/octave.bin
-  chmod 755 $bindir/octave.bin
-fi
-
 echo "installing octave-bug as $bindir/octave-bug"
 cp octave-bug $bindir/octave-bug
 chmod 755 $bindir/octave-bug
@@ -292,6 +280,26 @@
 cp doc/interpreter/octave.1 $mandir/octave.$manext
 chmod 644 $mandir/octave.$manext
 
+# Do this last, so that it won't be available if some other error
+# happens earlier.  Otherwise, people might try to run Octave with
+# an incomplete installation.
+
+if test "$prefix" = /usr/local
+then
+  echo "installing src/octave as $bindir/octave"
+  cp src/octave $bindir/octave
+  chmod 755 $bindir/octave
+else
+  echo "installing octave-sh as $bindir/octave"
+  sed "s|@OCTAVE_HOME@|$prefix|; s|@LD_LIBRARY_PATH@|$octlibdir|" octave-sh \
+    > $bindir/octave
+  chmod 755 $bindir/octave
+
+  echo "installing src/octave as $bindir/octave.bin"
+  cp src/octave $bindir/octave.bin
+  chmod 755 $bindir/octave.bin
+fi
+
 case "$canonical_host_type" in
   *-*-cygwin32)
     if $alt_dir; then
diff -r 64f8babb7b3d -r 9c68cfa263eb scripts/ChangeLog
--- a/scripts/ChangeLog	Tue Jan 25 09:44:17 2000 +0000
+++ b/scripts/ChangeLog	Tue Jan 25 10:17:56 2000 +0000
@@ -1,3 +1,7 @@
+2000-01-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* plot/mesh.m: Fix error message to reflect reality.
+
 2000-01-24  Cyril Humbert <humbert@phobos.univ-mlv.fr>
 
 	* statistics/distributions/weibull_pdf.m: Use correct formula.
diff -r 64f8babb7b3d -r 9c68cfa263eb scripts/plot/mesh.m
--- a/scripts/plot/mesh.m	Tue Jan 25 09:44:17 2000 +0000
+++ b/scripts/plot/mesh.m	Tue Jan 25 10:17:56 2000 +0000
@@ -76,8 +76,8 @@
         gsplot (zz);
         gset noparametric;
       else
-        msg = "mesh: rows (z) must be the same as length (x) and";
-        msg = sprintf ("%s\ncolumns (z) must be the same as length (y)", msg);
+        msg = "mesh: rows (z) must be the same as length (y) and";
+        msg = sprintf ("%s\ncolumns (z) must be the same as length (x)", msg);
         error (msg);
       endif
     elseif (is_matrix (x) && is_matrix (y) && is_matrix (z))