anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure that LyX/bin is the first element in the PATH on non-POSIX builds.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10064 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-06-14 17:01:06 +00:00
parent f7cbb7fecd
commit 46a0ca5671
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2005-06-14 Angus Leeming <leeming@lyx.org>
* lyx_main.C (init): ensure that the LyX binary dir is the first
element in the PATH on non-POSIX builds.
2005-06-11 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* LaTeXFeatures.C (getPackages): solve amsmath-wasysym conflict

14
src/lyx_main.C
View File

@ -406,13 +406,6 @@ void LyX::init(bool gui)
signal(SIGTERM, error_handler);
// SIGPIPE can be safely ignored.
#if !defined (USE_POSIX_PACKAGING)
// Add the directory containing the LyX executable to the path
// so that LyX can find things like reLyX.
if (package().build_support().empty())
prependEnvPath("PATH", package().binary_dir());
#endif
// Check that user LyX directory is ok. We don't do that if
// running in batch mode.
bool reconfigure = false;
@ -487,6 +480,13 @@ void LyX::init(bool gui)
if (!lyxrc.path_prefix.empty())
prependEnvPath("PATH", lyxrc.path_prefix);
#if !defined (USE_POSIX_PACKAGING)
// Add the directory containing the LyX executable to the path
// so that LyX can find things like reLyX.
if (package().build_support().empty())
prependEnvPath("PATH", package().binary_dir());
#endif
// Having reset the PATH we're now in a position to run configure
// if necessary.
if (reconfigure)