changeset 1719:63f6b1b57aae

[project @ 1996-01-09 05:23:22 by jwe]
author jwe
date Tue, 09 Jan 1996 05:25:07 +0000
parents c127e04cd4bf
children 36df074f5274
files src/pt-exp-base.cc src/variables.cc src/variables.h
diffstat 3 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/pt-exp-base.cc	Tue Jan 09 05:18:54 1996 +0000
+++ b/src/pt-exp-base.cc	Tue Jan 09 05:25:07 1996 +0000
@@ -2659,12 +2659,12 @@
       // function file is parsed, it probably doesn't matter that
       // much.
 
-      char *oct_lib = octave_lib_dir ();
-      int len = strlen (oct_lib);
-
       char *ff_name = fcn_file_in_path (file_name);
 
-      if (strncmp (oct_lib, ff_name, len) == 0)
+      char *system_dir = octave_fcn_file_dir ();
+      int len = strlen (system_dir);
+
+      if (strncmp (system_dir, ff_name, len) == 0)
 	system_fcn_file = 1;
 
       delete [] ff_name;
--- a/src/variables.cc	Tue Jan 09 05:18:54 1996 +0000
+++ b/src/variables.cc	Tue Jan 09 05:25:07 1996 +0000
@@ -377,6 +377,13 @@
 }
 
 char *
+octave_fcn_file_dir (void)
+{
+  static char *retval = subst_octave_home (OCTAVE_FCNFILEDIR);
+  return retval;
+}
+
+char *
 octave_bin_dir (void)
 {
   static char *retval = subst_octave_home (OCTAVE_BINDIR);
--- a/src/variables.h	Tue Jan 09 05:18:54 1996 +0000
+++ b/src/variables.h	Tue Jan 09 05:25:07 1996 +0000
@@ -128,6 +128,7 @@
 
 extern char *octave_lib_dir (void);
 extern char *octave_arch_lib_dir (void);
+extern char *octave_fcn_file_dir (void)
 extern char *octave_bin_dir (void);
 extern char *default_exec_path (void);
 extern char *default_path (void);