>>>>> "Darren" == Darren Freeman <[EMAIL PROTECTED]> writes:
Darren> Maybe the CVS tree should try to do that when building, by
Darren> assuming lyxdoc lives in the same dir as lyx-devel?
It would be easier to make lyx search in this directory too, like what
the following simple patch does
JMarc
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.961
diff -u -p -r1.961 ChangeLog
--- src/ChangeLog 21 Oct 2002 16:21:51 -0000 1.961
+++ src/ChangeLog 23 Oct 2002 14:03:14 -0000
@@ -1,3 +1,8 @@
+2002-10-23 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * lyxfunc.C (dispatch): also try to find the doc files in the
+ lyxdoc repository
+
2002-10-21 John Levon <[EMAIL PROTECTED]>
* BufferView.C: menuUndo ->undo, redo
Index: src/lyxfunc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfunc.C,v
retrieving revision 1.380
diff -u -p -r1.380 lyxfunc.C
--- src/lyxfunc.C 21 Oct 2002 16:21:53 -0000 1.380
+++ src/lyxfunc.C 23 Oct 2002 14:03:14 -0000
@@ -1095,14 +1095,18 @@ void LyXFunc::dispatch(FuncRequest const
setErrorMessage(N_("Missing argument"));
break;
}
- owner->prohibitInput();
- string const fname = i18nLibFileSearch("doc", arg, "lyx");
+ string fname = i18nLibFileSearch("doc", arg, "lyx");
if (fname.empty()) {
- lyxerr << "LyX: unable to find documentation file `"
- << arg << "'. Bad installation?" << endl;
- owner->allowInput();
- break;
+ fname = i18nLibFileSearch("../../lyxdoc", arg, "lyx");
+ if (fname.empty()) {
+ lyxerr << "LyX: unable to find documentation "
+ "file `" << arg
+ << "'. Bad installation?" << endl;
+ break;
+ }
}
+
+ owner->prohibitInput();
ostringstream str;
str << _("Opening help file") << ' '
<< MakeDisplayPath(fname) << "...";
