From f526e3bcd90c9cc2c824f1097aa3f7d30893e10d Mon Sep 17 00:00:00 2001 From: begasus Date: Sun, 17 Jun 2018 14:51:06 +0200 Subject: fix pkg-config paths diff --git a/CMakeLists.txt b/CMakeLists.txt index 3991219..1271a68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,8 +62,8 @@ add_definitions( set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE) set(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE) -set(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries" FORCE) -set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE) +set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries" FORCE) +set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation prefix for C header files" FORCE) if(APPLE) option(BUILD_FRAMEWORK "Build an OS X framework" OFF) diff --git a/libchromaprint.pc.cmake b/libchromaprint.pc.cmake index 3799329..4e23d91 100644 --- a/libchromaprint.pc.cmake +++ b/libchromaprint.pc.cmake @@ -1,7 +1,7 @@ -prefix=${CMAKE_INSTALL_PREFIX} -exec_prefix=${EXEC_INSTALL_PREFIX} -libdir=${LIB_INSTALL_DIR} -includedir=${INCLUDE_INSTALL_DIR} +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@LIB_INSTALL_DIR@ +includedir=@INCLUDE_INSTALL_DIR@ Name: ${PROJECT_NAME} Description: Audio fingerprint library -- 2.16.4