anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 17:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/support/package.C.in (relative_locale_dir): fix for Windows and OSX.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@13760 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2006-04-27 12:56:56 +00:00
parent 7ad2d800da
commit 63a3482753
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/support/ChangeLog
View File

@ -1,6 +1,10 @@
2006-04-27 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* package.C.in (relative_locale_dir): fix for Windows and OSX.
2006-04-25 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* package.C.in.C (Package): run lib/configure.py, not lib/configure
* package.C.in (Package): run lib/configure.py, not lib/configure
2006-04-06 Jean-Marc Lasgouttes <lasgouttes@lyx.org>

13
src/support/package.C.in
View File

@ -250,10 +250,10 @@ get_build_dirs(string const & abs_binary,
{
string const check_text = "Checking whether LyX is run in place...";
// We're looking for "lyxrc.defaults" in a directory
// We're looking for "Makefile" in a directory
// binary_dir/../lib
// We're also looking for "chkconfig.ltx" in a directory
// binary_dir/top_srcdir()/lib
// top_srcdir()/lib
// If both are found, then we're running LyX in-place.
// Note that the name of the lyx binary may be a symbolic link.
@ -265,11 +265,10 @@ get_build_dirs(string const & abs_binary,
string const build_support_dir =
get_build_support_dir(binary_dir, top_build_dir_location);
if (!FileSearch(build_support_dir, "lyxrc.defaults").empty()) {
if (!FileSearch(build_support_dir, "Makefile").empty()) {
// Try and find "chkconfig.ltx".
string const system_support_dir =
MakeAbsPath(AddPath(top_srcdir(), "lib"),
AddPath(binary_dir, "support"));
AddPath(top_srcdir(), "lib");
if (!FileSearch(system_support_dir, "chkconfig.ltx").empty()) {
lyxerr[Debug::INIT] << check_text << " yes"
@ -705,7 +704,11 @@ bool check_env_var_dir(string const & dir,
// The locale directory relative to the LyX system directory.
string const relative_locale_dir()
{
#if defined (USE_WINDOWS_PACKAGING) || defined (USE_MACOSX_PACKAGING)
return "locale/";
#else
return "../locale/";
#endif
}