Fix bug #12466

Amend 109ea2be by reintroducing the command prefix that was
inadvertently removed. The prefix sets the proper environment
for latex.

diff --git a/src/support/ForkedCalls.cpp b/src/support/ForkedCalls.cpp
index e770c4df688e73b6526dae010c242c06b7da20a0..b9462153e04afb1e879efc3eae4397ee4800a4b4 100644 (file)
--- a/src/support/ForkedCalls.cpp
+++ b/src/support/ForkedCalls.cpp
@@ -305,6 +305,8 @@ int ForkedCall::generateChild()
        if (command_.empty())
                return 1;
 
+       string const prefixed_command = cmd_prefix_ + command_;
+
 #if !defined (_WIN32)
        // POSIX
 
@@ -312,8 +314,8 @@ int ForkedCall::generateChild()
        // in a contiguous block of memory. The array contains pointers
        // to each word.
        // Don't forget the terminating `\0' character.
-       char const * const c_str = command_.c_str();
-       vector<char> vec(c_str, c_str + command_.size() + 1);
+       char const * const c_str = prefixed_command.c_str();
+       vector<char> vec(c_str, c_str + prefixed_command.size() + 1);
 
        // Splitting the command up into an array of words means replacing
        // the whitespace between words with '\0'. Life is complicated
@@ -377,7 +379,7 @@ int ForkedCall::generateChild()
        if (lyxerr.debugging(Debug::FILES)) {
                vector<char *>::iterator ait = argv.begin();
                vector<char *>::iterator const aend = argv.end();
-               lyxerr << "<command>\n\t" << command_
+               lyxerr << "<command>\n\t" << prefixed_command
                       << "\n\tInterpreted as:\n\n";
                for (; ait != aend; ++ait)
                        if (*ait)