From 26b375b7cf9f9165059e6a2b9fd9758bba857226 Mon Sep 17 00:00:00 2001
From: Bartosz Ziemba <b.ziemba@protonmail.com>
Date: Mon, 22 Feb 2021 12:21:13 +0100
Subject: [PATCH] Data directory lookup fix
---
src/CMakeLists.txt | 2 +-
src/libcorpus2/CMakeLists.txt | 2 +-
src/libcorpus2_whole/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d782c9..cbaa9da 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -66,7 +66,7 @@ if(MSVC OR BORLAND)
# add_definitions( -DBOOST_FILESYSTEM_DYN_LINK )
endif(MSVC OR BORLAND)
-set(LIBCORPUS2_INSTALL_DATA_DIR local/share/corpus2)
+set(LIBCORPUS2_INSTALL_DATA_DIR share/corpus2)
FIND_PATH(LIBCORPUS2_SRC_DATA_DIR
kipi.tagset
${CMAKE_SOURCE_DIR}/corpus2data
diff --git a/src/libcorpus2/CMakeLists.txt b/src/libcorpus2/CMakeLists.txt
index 3d006a0..2588977 100644
--- a/src/libcorpus2/CMakeLists.txt
+++ b/src/libcorpus2/CMakeLists.txt
@@ -132,7 +132,7 @@ endif(NOT ${LibXML++_PKGCONF_VERSION} VERSION_LESS 2.40)
)
install(
DIRECTORY ${LIBCORPUS2_SRC_DATA_DIR}/
- DESTINATION ${LIBCORPUS2_INSTALL_DATA_DIR}
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBCORPUS2_INSTALL_DATA_DIR}
FILES_MATCHING PATTERN "*.ini"
PATTERN "*.tagset"
PATTERN ".svn" EXCLUDE
diff --git a/src/libcorpus2_whole/CMakeLists.txt b/src/libcorpus2_whole/CMakeLists.txt
index 5114e5b..703a8e9 100755
--- a/src/libcorpus2_whole/CMakeLists.txt
+++ b/src/libcorpus2_whole/CMakeLists.txt
@@ -68,7 +68,7 @@ if(UNIX)
)
install(
DIRECTORY ${LIBCORPUS2_SRC_DATA_DIR}/
- DESTINATION ${LIBCORPUS2_INSTALL_DATA_DIR}
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBCORPUS2_INSTALL_DATA_DIR}
FILES_MATCHING PATTERN "*.ini"
PATTERN "*.tagset"
PATTERN ".svn" EXCLUDE
--
GitLab