changeset 3833:f3278ec3ccb7

[project @ 2001-05-17 12:31:52 by jwe]
author jwe
date Thu, 17 May 2001 12:31:52 +0000
parents 39aee8115584
children 414e694c9e6a
files liboctave/ChangeLog liboctave/pathsearch.cc scripts/ChangeLog
diffstat 3 files changed, 26 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog	Tue May 15 17:14:15 2001 +0000
+++ b/liboctave/ChangeLog	Thu May 17 12:31:52 2001 +0000
@@ -1,3 +1,9 @@
+2001-05-17  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* pathsearch.cc (dir_path::set_program_name): Set the environment
+	variables SELFAUTOLOC, SELFAUTODIR, SELFAUTOPARENT, and TEXMFDBS
+	to the empty string.
+
 2001-05-15  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Array2.h (Array2<T>::operator = (const Array2<T>&)):
--- a/liboctave/pathsearch.cc	Tue May 15 17:14:15 2001 +0000
+++ b/liboctave/pathsearch.cc	Thu May 17 12:31:52 2001 +0000
@@ -29,6 +29,7 @@
 #include <string>
 
 #include "lo-utils.h"
+#include "oct-env.h"
 #include "oct-kpse.h"
 #include "pathsearch.h"
 #include "str-vec.h"
@@ -136,6 +137,19 @@
 dir_path::set_program_name (const std::string& nm)
 {
   ::octave_kpse_set_progname (nm.c_str ());
+
+  // Calling kpse_set_progname has the unfortunate side-effect of
+  // exporting the following variables.  We make them empty here so
+  // that they will not interfere with TeX, if it is run as a
+  // subprocess of Octave.
+  //
+  // XXX FIXME XXX -- is there a reasonable way to actually remove
+  // them from the environment?
+
+  octave_env::putenv ("SELFAUTOLOC", "");
+  octave_env::putenv ("SELFAUTODIR", "");
+  octave_env::putenv ("SELFAUTOPARENT", "");
+  octave_env::putenv ("TEXMFDBS", "");
 }
 
 void
--- a/scripts/ChangeLog	Tue May 15 17:14:15 2001 +0000
+++ b/scripts/ChangeLog	Thu May 17 12:31:52 2001 +0000
@@ -4,12 +4,12 @@
 
 2001-02-28  Kai Habel  <kai.habel@gmx.de>
 
-    * general/cart2pol.m: New file.
-    * general/pol2cart.m: New file.
-    * general/cart2sph.m: New file.
-    * general/sph2cart.m: New file.
-    * image/rgb2hsv.m: New file.
-    * image/hsv2rgb.m: New file.
+	* general/cart2pol.m: New file.
+	* general/pol2cart.m: New file.
+	* general/cart2sph.m: New file.
+	* general/sph2cart.m: New file.
+	* image/rgb2hsv.m: New file.
+	* image/hsv2rgb.m: New file.
 
 2001-02-26  Paul Kienzle  <pkienzle@kienzle.powernet.co.uk>