Mercurial > octave
changeset 30305:c13204f823a6
build: Install all octave binaries to bindir on Windows.
* configure.ac (archlibdir): Windows search paths and relocation oddities
require all binaries must be installed in the same directory.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sat, 20 Nov 2021 14:01:56 +0100 |
| parents | b568c29bb5be |
| children | 8b993c46fc1c |
| files | configure.ac |
| diffstat | 1 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Fri Nov 19 20:57:09 2021 -0800 +++ b/configure.ac Sat Nov 20 14:01:56 2021 +0100 @@ -107,8 +107,15 @@ ## Where to put executables to be run by Octave, rather than the user. ## This path usually includes the Octave version and configuration name, so ## that configurations for multiple versions of Octave may be installed at once. -OCTAVE_SET_DEFAULT([archlibdir], - '${libexecdir}/octave/${version}/exec/${canonical_host_type}') +## Windows search paths and relocation oddities require all binaries must be +## installed in the same directory. +case $host_os in + mingw* | msdosmsvc) + OCTAVE_SET_DEFAULT([archlibdir], '${bindir}') ;; + *) + OCTAVE_SET_DEFAULT([archlibdir], + '${libexecdir}/octave/${version}/exec/${canonical_host_type}') ;; +esac ## Where to put executables to be run by Octave, rather than the user, that ## are specific to this site.