Mercurial > octave

comparison scripts/plot/util/private/__print_parse_opts__.m @ 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 7aa1994c0ca2
children 512f3d68bb49
comparison
equal deleted inserted replaced
30307:2f50556788ac 30308:a9de8cde1b22
629 629
630 function bin = __svgconv_binary__ () 630 function bin = __svgconv_binary__ ()
631 631
632 persistent binary = ""; 632 persistent binary = "";
633 633
634 if (isempty (binary) && ispc ())
635 ## On Windows, prefer the executable in the bin directory
636 ## (linking issue, see bug #59546)
637 bindir = getenv ("OCTAVE_BINDIR");
638 if (isempty (bindir))
639 bindir = __octave_config_info__ ("bindir");
640 endif
641
642 binary = fullfile (bindir, ...
643 ["octave-svgconvert", ...
644 __octave_config_info__("EXEEXT")]);
645
646 if (! exist (binary, "file"))
647 binary = "";
648 endif
649 endif
650
651 if (isempty (binary)) 634 if (isempty (binary))
652 ## default installation location is the archlib directory 635 ## default installation location is the archlib directory
653 bindir = getenv ("OCTAVE_ARCHLIBDIR"); 636 bindir = getenv ("OCTAVE_ARCHLIBDIR");
654 if (isempty (bindir)) 637 if (isempty (bindir))
655 bindir = __octave_config_info__ ("archlibdir"); 638 bindir = __octave_config_info__ ("archlibdir");