commit dd154a5837db1083dfa64eb98038699a8bb49958
Author: Kornel Benko <[email protected]>
Date: Tue Apr 14 19:59:41 2020 +0200
Cmake build: Fix use of LYX_ABS_INSTALLED_DATADIR
(Wrong display at configuration time. Also wrong value in created config.h)
---
CMakeLists.txt | 2 +-
development/unix/lyxrc.dist.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1d90f7..9410c39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -575,7 +575,7 @@ if(NOT LYX_DATA_SUBDIR)
endif()
endif()
-set(LYX_ABS_INSTALLED_DATADIR "${CMAKE_INSTALL_PREFIX}")
+set(LYX_ABS_INSTALLED_DATADIR "${CMAKE_INSTALL_PREFIX}/${LYX_DATA_SUBDIR}")
get_locale_destination(LYX_LOCALEDIR)
set(LYX_ABS_INSTALLED_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${LYX_LOCALEDIR}")
set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}")
diff --git a/development/unix/lyxrc.dist.in b/development/unix/lyxrc.dist.in
index 88e393f..3b10a81 100644
--- a/development/unix/lyxrc.dist.in
+++ b/development/unix/lyxrc.dist.in
@@ -12,5 +12,5 @@
Format 25
-\texinputs_prefix ".:@LYX_ABS_INSTALLED_DATADIR@/@LYX_DATA_SUBDIR@tex"
+\texinputs_prefix ".:@LYX_ABS_INSTALLED_DATADIR@tex"
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
