Mercurial > octave
changeset 24876:a41e264609c0
Fix misconfigured OCTAVE_DOCDIR (bug #53006)
| author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
|---|---|
| date | Wed, 14 Mar 2018 15:42:20 +0100 |
| parents | 7c7b60dd4d4c |
| children | 0bb22c75c2d4 |
| files | build-aux/subst-default-vals.in.sh libinterp/corefcn/toplev.cc |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/subst-default-vals.in.sh Mon Feb 12 23:53:16 2018 +0100 +++ b/build-aux/subst-default-vals.in.sh Wed Mar 14 15:42:20 2018 +0100 @@ -61,7 +61,7 @@ man1dir=`echo "@man1dir@" | sed "s|^${prefix}/||"` mandir=`echo "@mandir@" | sed "s|^${prefix}/||"` octdatadir=`echo "@octdatadir@" | sed "s|^${prefix}/||"` -octdatadir=`echo "@octdocdir@" | sed "s|^${prefix}/||"` +octdocdir=`echo "@octdocdir@" | sed "s|^${prefix}/||"` octetcdir=`echo "@octetcdir@" | sed "s|^${prefix}/||"` octincludedir=`echo "@octincludedir@" | sed "s|^${prefix}/||"` octlocaledir=`echo "@octlocaledir@" | sed "s|^${prefix}/||"` @@ -76,6 +76,7 @@ -e "s|%OCTAVE_CANONICAL_HOST_TYPE%|\"${canonical_host_type}\"|" \ -e "s|%OCTAVE_DATADIR%|\"${datadir}\"|" \ -e "s|%OCTAVE_DATAROOTDIR%|\"${datarootdir}\"|" \ + -e "s|%OCTAVE_DOCDIR%|\"${docdir}\"|" \ -e "s|%OCTAVE_DEFAULT_PAGER%|\"${DEFAULT_PAGER}\"|" \ -e "s|%OCTAVE_DOC_CACHE_FILE%|\"${doc_cache_file}\"|" \ -e "s|%OCTAVE_EXEC_PREFIX%|\"${exec_prefix}\"|" \
--- a/libinterp/corefcn/toplev.cc Mon Feb 12 23:53:16 2018 +0100 +++ b/libinterp/corefcn/toplev.cc Wed Mar 14 15:42:20 2018 +0100 @@ -411,6 +411,7 @@ { "man1ext", octave::config::man1_ext () }, { "mandir", octave::config::man_dir () }, { "octdatadir", octave::config::oct_data_dir () }, + { "octdocdir", octave::config::oct_doc_dir () }, { "octfiledir", octave::config::oct_file_dir () }, { "octetcdir", octave::config::oct_etc_dir () }, { "octincludedir", octave::config::oct_include_dir () },