anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix running lyx with libtools and shared libraries

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19428 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2007-08-11 18:15:33 +00:00
parent 8cea333572
commit fe8c51c822
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/support/Package.cpp.in
View File

@ -130,7 +130,12 @@ Package::Package(string const & command_line_arg0,
document_dir_ = get_document_dir(home_dir_);
FileName const abs_binary = abs_path_from_binary_name(command_line_arg0);
binary_dir_ = FileName(onlyPath(abs_binary.absFilename()));
string const bdir = onlyPath(abs_binary.absFilename());
// We may be using libtools
if (suffixIs(bdir, ".libs/"))
binary_dir_ = FileName(addPath(bdir, "../"));
else
binary_dir_ = FileName(bdir);
// Is LyX being run in-place from the build tree?
boost::tie(build_support_dir_, system_support_dir_) =
@ -252,7 +257,6 @@ get_build_support_dir(string const & binary_dir,
indirection = "../../lib";
break;
}
return FileName(normalizePath(addPath(binary_dir, indirection)));
}
@ -274,10 +278,12 @@ get_build_dirs(FileName const & abs_binary,
FileName binary = abs_binary;
while (true) {
// Try and find "lyxrc.defaults".
string const binary_dir = onlyPath(binary.absFilename());
string binary_dir = onlyPath(binary.absFilename());
// We may be using libtools with static linking.
if (suffixIs(binary_dir, ".libs/"))
binary_dir = addPath(binary_dir, "../");
FileName const build_support_dir =
get_build_support_dir(binary_dir, top_build_dir_location);
if (!fileSearch(build_support_dir.absFilename(), "Makefile").empty()) {
// Try and find "chkconfig.ltx".
string const system_support_dir =