# HG changeset patch # User jwe # Date 821165107 0 # Node ID 63f6b1b57aae8865f85ac82a650a9d1b8e14d431 # Parent c127e04cd4bf53fb59e943d564a05c5ac80434fc [project @ 1996-01-09 05:23:22 by jwe] diff --git a/src/pt-exp-base.cc b/src/pt-exp-base.cc --- a/src/pt-exp-base.cc +++ b/src/pt-exp-base.cc @@ -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; diff --git a/src/variables.cc b/src/variables.cc --- a/src/variables.cc +++ b/src/variables.cc @@ -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); diff --git a/src/variables.h b/src/variables.h --- a/src/variables.h +++ b/src/variables.h @@ -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);