From d23e5b40025dfd6a6bcb0cb13083db43e54001ed Mon Sep 17 00:00:00 2001
From: Bartosz Ziemba <b.ziemba@protonmail.com>
Date: Mon, 22 Feb 2021 12:20:17 +0100
Subject: [PATCH] Data directory lookup fix
---
.gitlab-ci.yml | 3 +--
Dockerfile | 2 +-
libmaca/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93011f6..5be63b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: clarinpl/cpp:latest
+image: clarinpl/cpp:16.04
stages:
- build
@@ -27,7 +27,6 @@ push_deb:
stage: deploy
only:
- master
- - develop # delete it after first merge to master
script:
- FILE=$(ls build/MorphAnalyser*.deb)
- curl --fail -i -X POST -F "file=@./${FILE}" -u "${APT_USERNAME}:${APT_PASSWORD}" https://apt.clarin-pl.eu/
diff --git a/Dockerfile b/Dockerfile
index e338aca..2425563 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM clarinpl/cpp
+FROM clarinpl/cpp:16.04
RUN add-apt-repository ppa:deadsnakes/ppa && \
apt-get update && \
diff --git a/libmaca/CMakeLists.txt b/libmaca/CMakeLists.txt
index 5de62a8..2756dd8 100644
--- a/libmaca/CMakeLists.txt
+++ b/libmaca/CMakeLists.txt
@@ -217,7 +217,7 @@ endif(NOT ${LibXML++_PKGCONF_VERSION} VERSION_LESS 2.40)
)
install(
DIRECTORY ${LIBMACA_SRC_DATA_DIR}/
- DESTINATION ${LIBMACA_INSTALL_DATA_DIR}
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBMACA_INSTALL_DATA_DIR}
FILES_MATCHING PATTERN "*.ini"
PATTERN "*.tagset"
PATTERN "*.conv"
--
GitLab