Mercurial > octave-nkf

diff libinterp/corefcn/defaults.cc @ 19066:d902542221c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new data directory for storing data files we distribute * configure.ac (octdatadir): New variable. * common.mk (do_subst_default_vals): Also substitute octdatadir for %OCTAVE_OCTDATADIR%. * defaults.in.h, defaults.cc (OCTAVE_OCTDATADIR): New macro. (Voct_data_dir): New global variable. (set_default_oct_data_dir): New static function. (install_defaults): Call it. * load-path.cc (load_path::do_initialize): Add Voct_data_dir to the default system load path. * toplev.cc (Foctave_config_info): Include octdatadir in result. * octave-config.in.cc (help_msg, initialize): Include OCTDATADIR in the list of variables. * run-octave.in: Include $top_srcdir/etc/data in LOADPATH.
author John W. Eaton <jwe@octave.org>
date Tue, 19 Aug 2014 05:41:06 -0400
parents 22187db555cf
children 8a8a7bc2a09d
line wrap: on
line diff
--- a/libinterp/corefcn/defaults.cc	Tue Aug 19 12:02:15 2014 -0400
+++ b/libinterp/corefcn/defaults.cc	Tue Aug 19 05:41:06 2014 -0400
@@ -74,6 +74,7 @@
 std::string Vlocal_api_fcn_file_dir;
 std::string Vlocal_fcn_file_dir;
 
+std::string Voct_data_dir;
 std::string Voct_etc_dir;
 std::string Voct_locale_dir;
 
@@ -219,6 +220,12 @@
 }
 
 static void
+set_default_oct_data_dir (void)
+{
+  Voct_data_dir = subst_octave_home (OCTAVE_OCTDATADIR);
+}
+
+static void
 set_default_oct_etc_dir (void)
 {
   Voct_etc_dir = subst_octave_home (OCTAVE_OCTETCDIR);
@@ -435,6 +442,7 @@
   set_default_local_api_fcn_file_dir ();
   set_default_local_fcn_file_dir ();
 
+  set_default_oct_data_dir ();
   set_default_oct_etc_dir ();
   set_default_oct_locale_dir ();