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

Fix libdir location in pkgconfig files. #3027

Open
wants to merge 1 commit into
base: fixes
Choose a base branch
from

Conversation

richmattes
Copy link
Contributor

The pkgconfig files currently hardcode the library directory as ${prefix}/lib, but the library installation directory in config.mk is set as ${prefix}/lib${LIB_SUFFIX}. This causes a mismatch between the library installation directory and the pkgconfig file on redhat-based 64-bit systems.

This commit remedies the issue for both the Makefile and CMake build by modifying the pkgconfig files to use CMAKE_INSTALL_LIBDIR instead of lib. In the CMake system, this directly reflects the installation path. The Makefiles were modified to replace CMAKE_INSTALL_LIBDIR with lib${LIB_SUFFIX}, matching the libdir definition in config.mk and following the pattern used in defining the prefix.

Thank you for contributing your time to the Mosquitto project!

Before you go any further, please note that we cannot accept contributions if
you haven't signed the Eclipse Contributor Agreement.
If you aren't able to do that, or just don't want to, please describe your bug
fix/feature change in an issue. For simple bug fixes it is can be just as easy
for us to be told about the problem and then go fix it directly.

Then please check the following list of things we ask for in your pull request:

  • Have you signed the Eclipse Contributor Agreement, using the same email address as you used in your commits?
  • Do each of your commits have a "Signed-off-by" line, with the correct email address? Use "git commit -s" to generate this line for you.
  • If you are contributing a new feature, is your work based off the develop branch?
  • If you are contributing a bugfix, is your work based off the fixes branch?
  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you successfully run make test with your changes locally?

The pkgconfig files currently hardcode the library directory as
${prefix}/lib, but the library installation directory in config.mk is
set as lib${LIB_SUFFIX}.  This causes a mismatch between the library
installation directory and the pkgconfig file on redhat-based 64-bit
systems.

This commit remedies the issue for both the Makefile and CMake build by
modifying the pkgconfig files to use CMAKE_INSTALL_LIBDIR instead of
"lib".  In the CMake system, this directly reflects the installation
path.  The Makefiles were modified to replace CMAKE_INSTALL_LIBDIR with
lib${LIB_SUFFIX}, matching the libdir definition in config.mk and
following the pattern used in defining the prefix.

Signed-off-by: Rich Mattes <[email protected]>
@richmattes
Copy link
Contributor Author

This should also address #2990.

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.

1 participant