Mercurial > hg > octave-max

changeset 15159:960aa8863476 gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: periodic merge of default to gui
author John W. Eaton <jwe@octave.org>
date Sat, 11 Aug 2012 17:35:16 -0400
parents 141b0b108292 (current diff) a87fa9132b72 (diff)
children 098546e95a5e
files
diffstat 2 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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 ();
 
--- 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;