Package package_;
bool initialised_ = false;
-} // namespace anon
+} // namespace
void init_package(string const & command_line_arg0,
string const fix_dir_name(string const & name);
-} // namespace anon
+} // namespace
Package::Package(string const & command_line_arg0,
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(lyx_dir().absFileName() + "../po/" + c + ".gmo");
if (!res.isReadableFile())
res = FileName(top_srcdir().absFileName() + "/po/" + c + ".gmo");
return res;
return program_suffix.empty() ? program_suffix : with_version_suffix;
}
-} // namespace anon
+} // namespace
FileName const & Package::top_srcdir()
return true;
}
// cmake file, no Makefile in lib
- FileName build_boost_dir = FileName(addPath(search_dir + "/3rdparty", "boost"));
- if (!fileSearch(build_boost_dir.absFileName(), "cmake_install.cmake").empty()) {
+ FileName build_src_dir = FileName(addPath(search_dir, "src"));
+ if (!fileSearch(build_src_dir.absFileName(), "cmake_install.cmake").empty()) {
return true;
}
bool lyxBinaryPath(FileName & lyx_binary, string const & search_dir, string const & ext)
{
lyx_binary = FileName();
- if(false) {
+ if(false) {
} else if (doesFileExist(lyx_binary, search_dir, "lyx" + ext)) {
} else if (doesFileExist(lyx_binary, search_dir, "LyX" + ext)) {
} else if (doesFileExist(lyx_binary, search_dir, "lyx" + string(PROGRAM_SUFFIX) + ext)) {
else if (!abs_binary.extension().empty()) {
ext = "." + abs_binary.extension();
}
-
+
string binary_dir = onlyPath(abs_binary.absFileName());
-
+
FileName lyx_binary;
if (lyxBinaryPath(lyx_binary, binary_dir, ext))
return lyx_binary;
string search_dir = onlyPath(FileName(addPath(binary_dir, "/../")).absFileName());
if (lyxBinaryPath(lyx_binary, search_dir, ext))
return lyx_binary;
-
+
return FileName();
}
return result;
}
-} // namespace anon
+} // namespace
} // namespace support
} // namespace lyx