Fix problem with python and change of PATH

- waits that lyxrc has been read before finding python
- when the PATH changes, resets the value
This commit is contained in:
Benjamin Piwowarski 2014-03-14 11:48:40 +01:00 committed by Richard Heck
parent 2da0d32771
commit 4e38cf1524

View File

@ -154,8 +154,9 @@ Package::Package(string const & command_line_arg0,
std::string const & Package::configure_command() const std::string const & Package::configure_command() const
{ {
if (configure_command_.empty()) { if (configure_command_.empty()) {
std::string &command = const_cast<std::string&>(configure_command_);
FileName const configure_script(addName(system_support().absFileName(), "configure.py")); FileName const configure_script(addName(system_support().absFileName(), "configure.py"));
configure_command_ = os::python() + ' ' + command = os::python() + ' ' +
quoteName(configure_script.toFilesystemEncoding()) + quoteName(configure_script.toFilesystemEncoding()) +
with_version_suffix() + " --binary-dir=" + with_version_suffix() + " --binary-dir=" +
quoteName(FileName(binary_dir().absFileName()).toFilesystemEncoding()); quoteName(FileName(binary_dir().absFileName()).toFilesystemEncoding());