Re: Re: Re: Re: Gettext removed from master

[Kornel Benko]

Am Samstag, 1. Juni 2013 um 09:29:38, schrieb Kornel Benko <kor...@lyx.org>
> > No, at runtime LyX searches the source dir, not the build dir.
> > 
> > Vincent
> 
> Is this an order? Why?

With this patch (search first in build-dir) it should work for automake and for 
cmake.

        Kornel
diff --git a/src/support/Package.cpp b/src/support/Package.cpp
index 59972d2..2e2aebd 100644
--- a/src/support/Package.cpp
+++ b/src/support/Package.cpp
@@ -168,9 +168,15 @@ void Package::set_temp_dir(FileName const & temp_dir) const
 
 FileName Package::messages_file(string const & c) const
 {
-	if (in_build_dir_)
-		return FileName(top_srcdir().absFileName() + "/po/"
-				+ c + ".gmo");
+	if (in_build_dir_) {
+                FileName res = FileName(lyx_dir().absFileName() + "/po/"
+                                                + c + ".gmo");
+                if (!res.isReadableFile())
+                        res = FileName(top_srcdir().absFileName() + "/po/"
+                                                + c + ".gmo");
+
+		return res;
+        }
 	else
 		return FileName(locale_dir_.absFileName() + "/" + c
 			+ "/LC_MESSAGES/" PACKAGE ".mo");

signature.asc
Description: This is a digitally signed message part.