anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Amend ef42541d26: Missed to commit these

Browse Source
This commit is contained in:
Kornel Benko 2020-04-13 13:39:33 +02:00
parent ef42541d26
commit 4b052dec77
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3rdparty/dtl/CMakeLists.txt vendored
View File

@ -32,5 +32,8 @@ foreach(_t ${targets})
add_man(${_t}.man) add_man(${_t}.man)
endforeach() endforeach()
install(TARGETS ${targets} DESTINATION ${LYX_UTILITIES_INSTALL_PATH}) # Install dtl tools in this directory to omit possible packaging conflicts
# if installing multiple lyx versions, each with own dtl executables
get_data_destination(dest_data)
install(TARGETS ${targets} DESTINATION "${CMAKE_INSTALL_PREFIX}/${dest_data}/extratools")
install(FILES ${_manuals} DESTINATION ${LYX_MAN_DIR}/man1) install(FILES ${_manuals} DESTINATION ${LYX_MAN_DIR}/man1)

19
src/LyX.cpp
View File

@ -909,6 +909,25 @@ bool LyX::init()
if (package().build_support().empty()) if (package().build_support().empty())
prependEnvPath("PATH", package().binary_dir().absFileName()); prependEnvPath("PATH", package().binary_dir().absFileName());
#endif #endif
{
// Add the directory containing the dt2dv and dv2dt executables to the path
FileName dtldir;
if (!package().build_support().empty()) {
// dtl executables should be in the same dir ar tex2lyx
dtldir = package().binary_dir();
}
else {
dtldir = FileName(addName(package().system_support().absFileName(), "extratools"));
}
#if defined(_WIN32)
string dtlexe = "dt2dv.exe";
#else
string dtlexe = "dt2dv";
#endif
FileName const dt2dv = FileName(addName(dtldir.absFileName(), dtlexe));
if (dt2dv.exists())
prependEnvPath("PATH", dtldir.absFileName());
}
if (!lyxrc.path_prefix.empty()) if (!lyxrc.path_prefix.empty())
prependEnvPath("PATH", replaceEnvironmentPath(lyxrc.path_prefix)); prependEnvPath("PATH", replaceEnvironmentPath(lyxrc.path_prefix));