Mercurial > octave-antonio
diff configure.ac @ 19032: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 | 54f4c63b8e5d |
children | c8240a60dd01 |
line wrap: on
line diff
--- a/configure.ac Tue Aug 19 12:02:15 2014 -0400 +++ b/configure.ac Tue Aug 19 05:41:06 2014 -0400 @@ -113,6 +113,7 @@ OCTAVE_SET_DEFAULT([octtestsdir], '$(octetcdir)/tests') OCTAVE_SET_DEFAULT([texi_macros_file], '$(octetcdir)/macros.texi') OCTAVE_SET_DEFAULT([imagedir], '$(datadir)/octave/$(version)/imagelib') +OCTAVE_SET_DEFAULT([octdatadir], '$(datadir)/octave/$(version)/data') OCTAVE_SET_DEFAULT([man1dir], '$(mandir)/man1') OCTAVE_SET_DEFAULT([man1ext], '.1') OCTAVE_SET_DEFAULT([infofile], '$(infodir)/octave.info')