Merge branch 'develop' into 'master'

Data directory lookup fix

See merge request !11

.gitlab-ci.yml

-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/

Dockerfile

-FROM clarinpl/cpp
+FROM clarinpl/cpp:16.04
 
 RUN add-apt-repository ppa:deadsnakes/ppa && \
     apt-get update && \

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"