Mercurial > octave-nkf
comparison scripts/pkg/private/configure_make.m @ 17613:6b8df90c8806
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 | 21656a949661 |
children | d63878346099 |
comparison
equal
deleted
inserted
replaced
17612:4669cfca69a0 | 17613:6b8df90c8806 |
---|---|
26 ## Perform ./configure, make, make install in "src". | 26 ## Perform ./configure, make, make install in "src". |
27 if (exist (fullfile (packdir, "src"), "dir")) | 27 if (exist (fullfile (packdir, "src"), "dir")) |
28 src = fullfile (packdir, "src"); | 28 src = fullfile (packdir, "src"); |
29 octave_bindir = octave_config_info ("bindir"); | 29 octave_bindir = octave_config_info ("bindir"); |
30 ver = version (); | 30 ver = version (); |
31 mkoctfile_program = fullfile (octave_bindir, sprintf ("mkoctfile-%s", ver)); | 31 ext = octave_config_info ("EXEEXT"); |
32 octave_config_program = fullfile (octave_bindir, sprintf ("octave-config-%s", ver)); | 32 mkoctfile_program = fullfile (octave_bindir, sprintf ("mkoctfile-%s%s", ver, ext)); |
33 octave_binary = fullfile (octave_bindir, sprintf ("octave-%s", ver)); | 33 octave_config_program = fullfile (octave_bindir, sprintf ("octave-config-%s%s", ver, ext)); |
34 octave_binary = fullfile (octave_bindir, sprintf ("octave-%s%s", ver, ext)); | |
34 cenv = {"MKOCTFILE"; mkoctfile_program; | 35 cenv = {"MKOCTFILE"; mkoctfile_program; |
35 "OCTAVE_CONFIG"; octave_config_program; | 36 "OCTAVE_CONFIG"; octave_config_program; |
36 "OCTAVE"; octave_binary; | 37 "OCTAVE"; octave_binary; |
37 "INSTALLDIR"; desc.dir}; | 38 "INSTALLDIR"; desc.dir}; |
38 scenv = sprintf ("%s=\"%s\" ", cenv{:}); | 39 scenv = sprintf ("%s=\"%s\" ", cenv{:}); |