From e23e65a973002bb16c9def19cc5228ac800359ac Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Mon, 10 Jul 2017 13:17:29 +0200 Subject: [PATCH] Cmake build: Install lyx-provided fonts to where GuiFontLoader.cpp expects them --- development/cmake/Install.cmake | 2 +- development/cmake/modules/LyXDestinations.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake index d428dcb674..b2e312dee2 100755 --- a/development/cmake/Install.cmake +++ b/development/cmake/Install.cmake @@ -14,7 +14,7 @@ endif() # Here we try to exclude files which we do not want to install # Depending on _what, installation on UNIX goes to # data -> ${LYX_DATA_SUBDIR} -# font -> share/fonts/truetype/${_lyx}/ +# font -> share/${_lyx}/fonts/ # bin -> bin # tex -> share/texmf/tex/latex/${_lyx}/ macro(lyx_install _what _parent_src_dir _gl_dir _file_type) diff --git a/development/cmake/modules/LyXDestinations.cmake b/development/cmake/modules/LyXDestinations.cmake index d003e915f7..1736ac2069 100644 --- a/development/cmake/modules/LyXDestinations.cmake +++ b/development/cmake/modules/LyXDestinations.cmake @@ -68,7 +68,7 @@ function(get_font_destination _result) set(_dir "${LYX_DATA_SUBDIR}fonts/") elseif(UNIX) # at least on ubuntu - set(_dir "share/fonts/truetype/${_lyx}/") + set(_dir "share/${_lyx}/fonts/") else() message(FATAL_ERROR "Unhandled platform") endif() -- 2.39.2