X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FForkedCalls.cpp;h=fc2b599484ef89ee8d3dff76991863583ad54ff2;hb=8e4648f38c2b6051832faf2e31e280ba36e3184a;hp=d77248eadcb12bb35e45e959afbc755e38808d74;hpb=f6ca8350cde26c90391e29fad16437f7b3287092;p=lyx.git

diff --git a/src/support/ForkedCalls.cpp b/src/support/ForkedCalls.cpp
index d77248eadc..fc2b599484 100644
--- a/src/support/ForkedCalls.cpp
+++ b/src/support/ForkedCalls.cpp
@@ -59,7 +59,7 @@ namespace {
 //
 /////////////////////////////////////////////////////////////////////
 
-class Murder : public boost::signals::trackable {
+class Murder : public boost::signals2::trackable {
 public:
 	//
 	static void killItDead(int secs, pid_t pid)
@@ -270,8 +270,8 @@ int ForkedProcess::waitForChild()
 //
 /////////////////////////////////////////////////////////////////////
 
-ForkedCall::ForkedCall(string const & path)
-	: cmd_prefix_(to_filesystem8bit(from_utf8(latexEnvCmdPrefix(path))))
+ForkedCall::ForkedCall(string const & path, string const & lpath)
+	: cmd_prefix_(to_filesystem8bit(from_utf8(latexEnvCmdPrefix(path, lpath))))
 {}
 
 
@@ -282,7 +282,7 @@ int ForkedCall::startScript(Starttype wait, string const & what)
 		return retval_;
 	}
 
-	command_ = trim(what);
+	command_ = commandPrep(trim(what));
 	signal_.reset();
 	return run(Wait);
 }
@@ -290,7 +290,7 @@ int ForkedCall::startScript(Starttype wait, string const & what)
 
 int ForkedCall::startScript(string const & what, SignalTypePtr signal)
 {
-	command_ = trim(what);
+	command_ = commandPrep(trim(what));
 	signal_  = signal;
 
 	return run(DontWait);
@@ -381,7 +381,7 @@ int ForkedCall::generateChild()
 		vector<char *>::iterator ait = argv.begin();
 		vector<char *>::iterator const aend = argv.end();
 		lyxerr << "<command>\n\t" << line
-		       << "\n\tInterpretted as:\n\n";
+		       << "\n\tInterpreted as:\n\n";
 		for (; ait != aend; ++ait)
 			if (*ait)
 				lyxerr << '\t'<< *ait << '\n';
@@ -553,7 +553,7 @@ string const getChildErrorMessage()
 
 namespace ForkedCallsController {
 
-typedef shared_ptr<ForkedProcess> ForkedProcessPtr;
+typedef std::shared_ptr<ForkedProcess> ForkedProcessPtr;
 typedef list<ForkedProcessPtr> ListType;
 typedef ListType::iterator iterator;