Mercurial > octave

changeset 30308:a9de8cde1b22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert work-around from 7aa1994c0ca2. * scripts/plot/util/private/__print_parse_opts__.m (__svgconv_binary__): "archlibdir" is now a directory that can be used also on Windows (where it is the same as "bindir"). Remove work-around.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 20 Nov 2021 18:52:33 +0100
parents 2f50556788ac
children bf619727bf6c
files scripts/plot/util/private/__print_parse_opts__.m
diffstat 1 files changed, 0 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/plot/util/private/__print_parse_opts__.m	Sat Nov 20 15:59:27 2021 +0100
+++ b/scripts/plot/util/private/__print_parse_opts__.m	Sat Nov 20 18:52:33 2021 +0100
@@ -631,23 +631,6 @@
 
   persistent binary = "";
 
-  if (isempty (binary) && ispc ())
-    ## On Windows, prefer the executable in the bin directory
-    ## (linking issue, see bug #59546)
-    bindir = getenv ("OCTAVE_BINDIR");
-    if (isempty (bindir))
-      bindir = __octave_config_info__ ("bindir");
-    endif
-
-    binary = fullfile (bindir, ...
-                       ["octave-svgconvert", ...
-                        __octave_config_info__("EXEEXT")]);
-
-    if (! exist (binary, "file"))
-      binary = "";
-    endif
-  endif
-
   if (isempty (binary))
     ## default installation location is the archlib directory
     bindir = getenv ("OCTAVE_ARCHLIBDIR");