diff libinterp/corefcn/load-path.cc @ 19224:d902542221c8

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 cc8aaf9c9e33
children 03067dab10ca
line wrap: on
line diff
--- a/libinterp/corefcn/load-path.cc
+++ b/libinterp/corefcn/load-path.cc
@@ -569,6 +569,7 @@
       maybe_add_path_elts (sys_path, Vlocal_fcn_file_dir);
       maybe_add_path_elts (sys_path, Voct_file_dir);
       maybe_add_path_elts (sys_path, Vfcn_file_dir);
+      maybe_add_path_elts (sys_path, Voct_data_dir);
     }
 
   std::string tpath = load_path::command_line_path;