Mercurial > octave-nkf
diff libinterp/corefcn/defaults.in.h @ 19066: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 | 175b392e91fe |
children | 4197fc428c7d |
line wrap: on
line diff
--- a/libinterp/corefcn/defaults.in.h Tue Aug 19 12:02:15 2014 -0400 +++ b/libinterp/corefcn/defaults.in.h Tue Aug 19 05:41:06 2014 -0400 @@ -148,6 +148,10 @@ #define OCTAVE_MANDIR %OCTAVE_MANDIR% #endif +#ifndef OCTAVE_OCTDATADIR +#define OCTAVE_OCTDATADIR %OCTAVE_OCTDATADIR% +#endif + #ifndef OCTAVE_OCTFILEDIR #define OCTAVE_OCTFILEDIR %OCTAVE_OCTFILEDIR% #endif @@ -202,6 +206,7 @@ extern OCTINTERP_API std::string Vlocal_api_fcn_file_dir; extern OCTINTERP_API std::string Vlocal_fcn_file_dir; +extern OCTINTERP_API std::string Voct_data_dir; extern OCTINTERP_API std::string Voct_etc_dir; extern OCTINTERP_API std::string Voct_locale_dir;