From afc9a17d359b25b8636ffa535ffe2a1cb1fbba01 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 10 Oct 2017 12:50:42 -0700 Subject: Don't use CMAKE_INSTALL_LIBDIR to create libcmark.pc. For some reason this wasn't getting set in processing libcmark.pc.in, and we were getting the wrong entry in libcmark.pc. (See #236) The new approach sets an internal libdir variable to lib${LIB_SUFFIX}. This variable is used both to set the install destination and in the libcmark.pc.in template. Closes #236. However, I'd welcome comments from @juhp who originally added CMAKE_INSTALL_LIBDIR in #185. I think that the new system should work fine with Fedora, since LIB_SUFFIX will be set appropriately, but some testing is in order. --- src/libcmark.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libcmark.pc.in') diff --git a/src/libcmark.pc.in b/src/libcmark.pc.in index 024ae48..0f87c30 100644 --- a/src/libcmark.pc.in +++ b/src/libcmark.pc.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ +libdir=@CMAKE_INSTALL_PREFIX@/@libdir@ includedir=@CMAKE_INSTALL_PREFIX@/include Name: libcmark -- cgit v1.2.3