Mercurial > octave
changeset 24935:c27398f0601c stable
maint: revert inadvertent changes from merge revision ff80c319e664
* configure.ac, corrcoef.m: Revert inadvertently deleted or duplicated lines
from merge revision ff80c319e664.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Mon, 19 Mar 2018 18:33:51 -0700 |
| parents | 1db0b81efafe |
| children | 0a2fe3ad0519 |
| files | configure.ac scripts/statistics/corrcoef.m |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Mon Mar 19 18:27:10 2018 -0700 +++ b/configure.ac Mon Mar 19 18:33:51 2018 -0700 @@ -172,9 +172,11 @@ ## Where Octave will search for fallback font files shipped with distribution. OCTAVE_SET_DEFAULT([octfontsdir], '${datadir}/octave/${version}/fonts') + ## Where Octave will look for startup files. OCTAVE_SET_DEFAULT([startupfiledir], '${fcnfiledir}/startup') OCTAVE_SET_DEFAULT([localstartupfiledir], '${localfcnfiledir}/startup') + ## Where Octave will look for man and info files. OCTAVE_SET_DEFAULT([man1dir], '${mandir}/man1') OCTAVE_SET_DEFAULT([man1ext], '.1') @@ -2906,6 +2908,7 @@ AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test $ENABLE_DOCS = yes]) ### Determine whether Mercurial ID should be embedded in library binaries. + ENABLE_HG_ID=yes AC_ARG_ENABLE([hg-id], [AS_HELP_STRING([--disable-hg-id],
--- a/scripts/statistics/corrcoef.m Mon Mar 19 18:27:10 2018 -0700 +++ b/scripts/statistics/corrcoef.m Mon Mar 19 18:33:51 2018 -0700 @@ -292,4 +292,3 @@ %!error <"alpha" must be a number between 0 and 1> corrcoef (1,2, "alpha", 2) %!error <"rows" must be "all"...> corrcoef (1,2, "rows", "foobar") %!error <Unknown option "foobar"> corrcoef (1,2, "foobar", 1) -%!error <Unknown option "foobar"> corrcoef (1,2, "foobar", 1)