From 46a0ca56719e935d082ac984d090d6c9ad0b1ad3 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Tue, 14 Jun 2005 17:01:06 +0000 Subject: [PATCH] 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 --- src/ChangeLog | 5 +++++ src/lyx_main.C | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 7eb5de690d..4c8c3dc447 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-06-14 Angus Leeming + + * 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 * LaTeXFeatures.C (getPackages): solve amsmath-wasysym conflict diff --git a/src/lyx_main.C b/src/lyx_main.C index 01c2aaafff..9a42be6b3f 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -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)