Mercurial > octave-nkf

changeset 17613:6b8df90c8806

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add executable extension to program paths for Windows (bug #40180) * mkoctfile.m, configure_make.m: Add EXEEXT to auxiliary programs when checking for existence and executing.
author Mike Miller <mtmiller@ieee.org>
date Tue, 08 Oct 2013 21:07:43 -0400
parents 4669cfca69a0
children ce7b9abf6600
files scripts/miscellaneous/mkoctfile.m scripts/pkg/private/configure_make.m
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/miscellaneous/mkoctfile.m	Tue Oct 08 19:11:32 2013 -0400
+++ b/scripts/miscellaneous/mkoctfile.m	Tue Oct 08 21:07:43 2013 -0400
@@ -143,8 +143,9 @@
 function [output, status] = mkoctfile (varargin)
 
   bindir = octave_config_info ("bindir");
+  ext = octave_config_info ("EXEEXT");
 
-  shell_script = fullfile (bindir, sprintf ("mkoctfile-%s", OCTAVE_VERSION));
+  shell_script = fullfile (bindir, sprintf ("mkoctfile-%s%s", OCTAVE_VERSION, ext));
 
   if (! exist (shell_script, "file"))
     __gripe_missing_component__ ("mkoctfile", "mkoctfile");
--- a/scripts/pkg/private/configure_make.m	Tue Oct 08 19:11:32 2013 -0400
+++ b/scripts/pkg/private/configure_make.m	Tue Oct 08 21:07:43 2013 -0400
@@ -28,9 +28,10 @@
     src = fullfile (packdir, "src");
     octave_bindir = octave_config_info ("bindir");
     ver = version ();
-    mkoctfile_program = fullfile (octave_bindir, sprintf ("mkoctfile-%s", ver));
-    octave_config_program = fullfile (octave_bindir, sprintf ("octave-config-%s", ver));
-    octave_binary = fullfile (octave_bindir, sprintf ("octave-%s", ver));
+    ext = octave_config_info ("EXEEXT");
+    mkoctfile_program = fullfile (octave_bindir, 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));
     cenv = {"MKOCTFILE"; mkoctfile_program;
             "OCTAVE_CONFIG"; octave_config_program;
             "OCTAVE"; octave_binary;