Mercurial > octave-nkf

diff build-aux/common.mk @ 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 dcb260e7a648
children c8240a60dd01
line wrap: on
line diff
--- a/build-aux/common.mk	Tue Aug 19 12:02:15 2014 -0400
+++ b/build-aux/common.mk	Tue Aug 19 05:41:06 2014 -0400
@@ -689,6 +689,7 @@
   -e "s|%OCTAVE_MAN1DIR%|\"${man1dir}\"|" \
   -e "s|%OCTAVE_MAN1EXT%|\"${man1ext}\"|" \
   -e "s|%OCTAVE_MANDIR%|\"${mandir}\"|" \
+  -e "s|%OCTAVE_OCTDATADIR%|\"${octdatadir}\"|" \
   -e "s|%OCTAVE_OCTFILEDIR%|\"${octfiledir}\"|" \
   -e "s|%OCTAVE_OCTETCDIR%|\"${octetcdir}\"|" \
   -e "s|%OCTAVE_OCTINCLUDEDIR%|\"${octincludedir}\"|" \