Mercurial > octave-nkf
diff run-octave.in @ 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 | 525af54479eb |
children | eeb22763138b |
line wrap: on
line diff
--- a/run-octave.in Tue Aug 19 12:02:15 2014 -0400 +++ b/run-octave.in Tue Aug 19 05:41:06 2014 -0400 @@ -33,18 +33,21 @@ d1="$top_srcdir/scripts" d2="$builddir/scripts" d3="$builddir/libinterp" +d4="$top_srcdir/examples/data" d1_list=`$FIND "$d1" -type d -a ! \( \( -name private -o -name '@*' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'` d2_list=`$FIND "$d2" -type d -a ! \( \( -name private -o -name '@*' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'` d3_list=`$FIND "$d3" -type d -a ! \( \( -name private -o -name '@*' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'` +d4_list=`$FIND "$d4" -type d -exec echo '{}' ';' | $SED 's/$/:/'` d1_path=`echo "$d1_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'` d2_path=`echo "$d2_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'` d3_path=`echo "$d3_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'` +d4_path=`echo "$d4_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'` octave_executable="$builddir/src/octave" -LOADPATH="$d1_path:$d2_path:$d3_path" +LOADPATH="$d1_path:$d2_path:$d3_path:$d4_path" IMAGEPATH="$top_srcdir/scripts/image" DOCFILE="$builddir/doc/interpreter/doc-cache" BUILT_IN_DOCSTRINGS_FILE="$builddir/libinterp/DOCSTRINGS"