Mercurial > octave
changeset 25565:a461dedb833f
maint: merge stable to default.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 09 Jul 2018 13:11:33 -0700 |
| parents | a24b55da36ac (current diff) 65a28dec405b (diff) |
| children | eee01a6e197f |
| files | |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/pkg/private/configure_make.m Mon Jul 09 11:33:25 2018 -0700 +++ b/scripts/pkg/private/configure_make.m Mon Jul 09 13:11:33 2018 -0700 @@ -34,7 +34,11 @@ sprintf ("mkoctfile-%s%s", ver, ext)); octave_config_program = fullfile (octave_bindir, ... sprintf ("octave-config-%s%s", ver, ext)); - octave_binary = fullfile (octave_bindir, sprintf ("octave-%s%s", ver, ext)); + if (ispc () && ! isunix ()) + octave_binary = fullfile (octave_bindir, sprintf ("octave-%s.bat", ver)); + else + octave_binary = fullfile (octave_bindir, sprintf ("octave-%s%s", ver, ext)); + endif if (! exist (mkoctfile_program, "file")) __gripe_missing_component__ ("pkg", "mkoctfile");