Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake: fix destination path #34

Merged
merged 3 commits into from
Nov 2, 2023
Merged

cmake: fix destination path #34

merged 3 commits into from
Nov 2, 2023

Conversation

komainu8
Copy link
Member

@komainu8 komainu8 commented Nov 1, 2023

share/${GROONGA_NORMALIZER_MYSQL_PROJECT_NAME} is shown share/groonga-normalizer-mysql.
Thus, README.md and doc/text/lgpl-2.0.txtare installed in share/groonga-normalizer-mysql/.
However, these files are installed share/doc/groonga-normalizer-mysql/ for RPM packages.

See: https://github.com/groonga/groonga-normalizer-mysql/blob/main/packages/yum/groonga-normalizer-mysql.spec.in#L59C1-L59C42

I change destination path share/groonga-normalizer-mysql to share/doc/groonga-normalizer-mysql.


https://github.com/groonga/groonga-normalizer-mysql/blob/main/CMakeLists.txt#L97 is defined DESTINATION "${CMAKE_LIBDIR}/pkgconfig/".
However, CMAKE_LIBDIR is not definition. (Probably, CMAKE_LIBDIR is null.)
Thus, groonga-normalizer-mysql.pc is installed to pkgconfig/. This install path is not expected.

I change destination path pkgconfig/ to usr/lib64(or lib)/pkgconfig.

Because CMAKE_LIBDIR is none currently.
Thus, groonga-normalizer-mysql.pc is installed to groonga-normalizer-mysql-1.2.3/groonga-normalizer-mysql.pc
@komainu8 komainu8 changed the title cmake: fix install path for documents cmake: fix destination path Nov 1, 2023
@komainu8 komainu8 mentioned this pull request Nov 1, 2023
8 tasks
Copy link
Member

@kou kou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, could you explain why these changes are needed, what problems were happen with full log and how do you fix these problems in the PR description?

CMakeLists.txt Outdated
"share/${GROONGA_NORMALIZER_MYSQL_PROJECT_NAME}")
if(NOT DEFINED GROONGA_NORMALIZER_MYSQL_DOC_DIR)
set(GROONGA_NORMALIZER_MYSQL_DOC_DIR
"share/doc/${GROONGA_NORMALIZER_MYSQL_PROJECT_NAME}")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@@ -46,6 +46,7 @@ This package provides development files for groonga-normalizer-mysql.
%cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \
-DCMAKE_LIBDIR=%{_libdir} \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should use CMAKE_INSTALL_LIBDIR by including GNUInstallDirs instead of specifying CMAKE_LIBDIR explicitly.

@komainu8
Copy link
Member Author

komainu8 commented Nov 2, 2023

Thank you for your comments. I've fixed them.

@kou kou merged commit 200ed0b into main Nov 2, 2023
20 of 24 checks passed
@kou kou deleted the fix-install-doc-dir branch November 2, 2023 04:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants