changeset 30630:b55189efd92a

maint: Merge stable to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 11 Jan 2022 19:25:24 +0100
parents 09b2f1847842 (current diff) 2a234181057b (diff)
children f1cec1134dd1
files
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/pkg/private/configure_make.m	Tue Jan 11 08:19:33 2022 -0800
+++ b/scripts/pkg/private/configure_make.m	Tue Jan 11 19:25:24 2022 +0100
@@ -40,11 +40,7 @@
                                   sprintf ("mkoctfile-%s%s", ver, ext));
     octave_config_program = fullfile (octave_bindir, ...
                                       sprintf ("octave-config-%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
+    octave_binary = fullfile (octave_bindir, sprintf ("octave-%s%s", ver, ext));
 
     if (! exist (mkoctfile_program, "file"))
       __gripe_missing_component__ ("pkg", "mkoctfile");