From 2f33755814467ee708e99385a2996a3c57cf0a2e Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Fri, 4 Jan 2013 11:05:12 +0100 Subject: [PATCH] findLyxBinary(): Add program suffix test before trying to determine and use the extension to search for the lyx-executable --- src/support/Package.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/support/Package.cpp b/src/support/Package.cpp index a158b49d3a..6ea458e67c 100644 --- a/src/support/Package.cpp +++ b/src/support/Package.cpp @@ -348,7 +348,14 @@ bool lyxBinaryPath(FileName & lyx_binary, string const & search_dir, string cons FileName findLyxBinary(FileName const & abs_binary) { string ext; - if (!abs_binary.extension().empty()) { + string checkname = abs_binary.toFilesystemEncoding(); + int check_len = checkname.length(); + int prgsuffixlen = string(PROGRAM_SUFFIX).length(); + if ((prgsuffixlen > 0) && (check_len > prgsuffixlen) && + (checkname.substr(check_len-prgsuffixlen) == string(PROGRAM_SUFFIX))) { + ext = ""; + } + else if (!abs_binary.extension().empty()) { ext = "." + abs_binary.extension(); } -- 2.39.5