Cmake build: Install lyx-provided fonts to where GuiFontLoader.cpp expects them

diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index d428dcb674e7b65d70923620ad169734ea7b64f7..b2e312dee27baa1107aa9c8d51ed40483b62e16a 100755 (executable)
--- 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 d003e915f7c225824e0474f637b075fd86bab2d3..1736ac2069721673651034f6daf9a178d3b8cbfa 100644 (file)
--- 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()