Correctly find the gmo files in build dir

The path to the lyx binary is either <build_dir>/bin (CMake) or
<build_dir>/src (autotools). This means the po directory can be found one
directory up.
This commit is contained in:
Vincent van Ravesteijn 2013-06-02 15:11:37 +02:00
parent 90610dbc0d
commit 129d43c5c9

View File

@ -169,15 +169,11 @@ void Package::set_temp_dir(FileName const & temp_dir) const
FileName Package::messages_file(string const & c) const
{
if (in_build_dir_) {
FileName res = FileName(lyx_dir().absFileName() + "/po/"
+ c + ".gmo");
FileName res = FileName(lyx_dir().absFileName() + "/../po/" + c + ".gmo");
if (!res.isReadableFile())
res = FileName(top_srcdir().absFileName() + "/po/"
+ c + ".gmo");
res = FileName(top_srcdir().absFileName() + "/po/" + c + ".gmo");
return res;
}
else
} else
return FileName(locale_dir_.absFileName() + "/" + c
+ "/LC_MESSAGES/" PACKAGE ".mo");
}