mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-23 02:14:50 +00:00
Ensure that LyX/bin is the first element in the PATH on non-POSIX builds.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10064 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
f7cbb7fecd
commit
46a0ca5671
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user