Cmake build: Fix use of LYX_ABS_INSTALLED_DATADIR

(Wrong display at configuration time. Also wrong value in created config.h)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1d90f7de17f89b858d5fe9ed69910e9201aa54e..9410c391d271e0d1ea54bd3567597acece210e41 100644 (file)
--- 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 88e393f028ffd18353c81a76e9b55d0a47fcf1e0..3b10a816fa08ad6af222b82905ec736586a39135 100644 (file)
--- 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"