Look for lyx2lyx in LYXDIR/lyx2lyx/

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5196 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 983b84eede3ebcc9eacf7b97228121af3e96df7a..761f4758e3e89cf274dbc2e9055a50cd3373e91e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-29  Dekel Tsur  <dekelts@tau.ac.il>
+
+       * buffer.C (readFile): Look for lyx2lyx in LYXDIR/lyx2lyx/
+
 2002-09-03  Angus Leeming  <leeming@lyx.org>
 
        * BufferView_pimpl.h: qualified name is not allowed in member

diff --git a/src/buffer.C b/src/buffer.C
index 2a3ebc753afc8f5d910a6923d6938f1e7efc90c5..78011ecda77cd1aedea841bc7f5ca20de81b1333 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -1171,7 +1171,15 @@ bool Buffer::readFile(LyXLex & lex, Paragraph * par)
                                                     "Use LyX 0.10.x to read this!"));
                                        return false;
                                } else {
-                                       string const command = "lyx2lyx "
+                                       string command = 
+                                               LibFileSearch("lyx2lyx", "lyx2lyx");
+                                       if (command.empty()) {
+                                               Alert::alert(_("ERROR!"),
+                                                            _("Can't find conversion script."));
+                                               return false;
+                                       }
+                                       command += " -t"
+                                               +tostr(LYX_FORMAT)+" "
                                                + QuoteName(filename_);
                                        cmd_ret const ret = RunCommand(command);
                                        if (ret.first) {