From 72ae6b6e3d5a6e4e238840cabdc937c100907a60 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Tue, 12 Jan 2021 15:48:01 +0900 Subject: [PATCH] Use macro for python3 sitelib Change-Id: Ie9969240e1fecb6474f3b52f83f2e63c43f2d3f3 Signed-off-by: Jihoon Kim --- nlp_resource_data/CMakeLists.txt | 4 ++-- packaging/nlp.spec | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nlp_resource_data/CMakeLists.txt b/nlp_resource_data/CMakeLists.txt index f3269f4..a30a795 100755 --- a/nlp_resource_data/CMakeLists.txt +++ b/nlp_resource_data/CMakeLists.txt @@ -6,6 +6,6 @@ PROJECT(${fw_name} C) INCLUDE(FindPkgConfig) -INSTALL(DIRECTORY nltk DESTINATION ${LIBDIR}/python3.9/site-packages) -INSTALL(DIRECTORY langdetect DESTINATION ${LIBDIR}/python3.9/site-packages) +INSTALL(DIRECTORY nltk DESTINATION ${PYTHON3_SITELIB_PATH}) +INSTALL(DIRECTORY langdetect DESTINATION ${PYTHON3_SITELIB_PATH}) INSTALL(DIRECTORY nltk_data DESTINATION /usr/local/lib/) diff --git a/packaging/nlp.spec b/packaging/nlp.spec index aba8d61..efd5521 100755 --- a/packaging/nlp.spec +++ b/packaging/nlp.spec @@ -51,7 +51,7 @@ GTest for NLP %define _app_bin_dir %{_app_home_dir}/bin MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR:PATH=%{_libdir} +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR:PATH=%{_libdir} -DPYTHON3_SITELIB_PATH=%{python3_sitelib} make %{?jobs:-j%jobs} %install @@ -76,8 +76,8 @@ tpk-backend -d %{name} --preload --force-remove %attr(755,root,root) %{_app_bin_dir}/org.tizen.nlp.service %{_app_bin_dir}/* %{TZ_SYS_RO_PACKAGES}/org.tizen.nlp.service.xml -%{_libdir}/python3.9/site-packages/langdetect/* -%{_libdir}/python3.9/site-packages/nltk/* +%{python3_sitelib}/langdetect/* +%{python3_sitelib}/nltk/* %license LICENSE %files data-en -- 2.7.4