# HG changeset patch # User John W. Eaton # Date 1344720916 14400 # Node ID 960aa8863476bb225a82e5e12596de3688a7d409 # Parent 141b0b1082926b85b642d4b5ec4598f5766d7b5c# Parent a87fa9132b72c04c0ae90c4810c0c5f21edaa8d7 maint: periodic merge of default to gui diff --git a/src/interpfcn/defaults.cc b/src/interpfcn/defaults.cc --- a/src/interpfcn/defaults.cc +++ b/src/interpfcn/defaults.cc @@ -74,6 +74,8 @@ std::string Vlocal_api_fcn_file_dir; std::string Vlocal_fcn_file_dir; +std::string Voct_etc_dir; + std::string Voct_file_dir; std::string Vfcn_file_dir; @@ -214,6 +216,12 @@ } static void +set_default_oct_etc_dir (void) +{ + Voct_etc_dir = subst_octave_home (OCTAVE_OCTETCDIR); +} + +static void set_default_oct_file_dir (void) { Voct_file_dir = subst_octave_home (OCTAVE_OCTFILEDIR); @@ -390,6 +398,8 @@ set_default_local_api_fcn_file_dir (); set_default_local_fcn_file_dir (); + set_default_oct_etc_dir (); + set_default_fcn_file_dir (); set_default_oct_file_dir (); diff --git a/src/interpfcn/defaults.in.h b/src/interpfcn/defaults.in.h --- a/src/interpfcn/defaults.in.h +++ b/src/interpfcn/defaults.in.h @@ -194,6 +194,8 @@ extern std::string Vlocal_api_fcn_file_dir; extern std::string Vlocal_fcn_file_dir; +extern std::string Voct_etc_dir; + extern std::string Voct_file_dir; extern std::string Vfcn_file_dir;