diff --git a/consumer/CMakeLists.txt b/consumer/CMakeLists.txt index 6553264fb85ea9b8f4457c4dd2de69867b8f9f3a..12822065632fd466baa993aa3778bedc94a25930 100644 --- a/consumer/CMakeLists.txt +++ b/consumer/CMakeLists.txt @@ -11,7 +11,6 @@ if(BUILD_CONSUMER_TOOLS) add_subdirectory(tools) endif() -include(GNUInstallDirs) configure_file(libasapo-consumer.pc.in libasapo-consumer.pc) install(FILES ${CMAKE_BINARY_DIR}/consumer/libasapo-consumer.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + DESTINATION lib/pkgconfig) diff --git a/consumer/libasapo-consumer.pc.in b/consumer/libasapo-consumer.pc.in index 5ae055f45f419a0227a1032f3d79fd8ebd1476ed..b7addbb64a3db5c5bbcc2026e27f5eb4cdea3022 100644 --- a/consumer/libasapo-consumer.pc.in +++ b/consumer/libasapo-consumer.pc.in @@ -1,11 +1,11 @@ prefix=${CMAKE_INSTALL_PREFIX} exec_prefix=${CMAKE_INSTALL_PREFIX} -libdir=${CMAKE_INSTALL_FULL_LIBDIR} -includedir=${CMAKE_INSTALL_FULL_INCLUDEDIR} +libdir=${CMAKE_INSTALL_PREFIX}/lib +includedir=${CMAKE_INSTALL_PREFIX}/include Name: libasapo-consumer Description: ASAP::O consumer API Version: ${ASAPO_CONSUMER_PROTOCOL} -Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR} -Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -lasapo-consumer +Cflags: -I${CMAKE_INSTALL_PREFIX}/include +Libs: -L${CMAKE_INSTALL_PREFIX}/lib -lasapo-consumer Libs.private: -lcurl -lstdc++ -lpthread -ld diff --git a/producer/CMakeLists.txt b/producer/CMakeLists.txt index 7f0b9114f04668ed140ef2b67f53e17928b286a9..13d54a0fce3aff19cadcce3abb9214ec6d0774b5 100644 --- a/producer/CMakeLists.txt +++ b/producer/CMakeLists.txt @@ -8,7 +8,6 @@ if(BUILD_EVENT_MONITOR_PRODUCER) add_subdirectory(event_monitor_producer) endif(BUILD_EVENT_MONITOR_PRODUCER) -include(GNUInstallDirs) configure_file(libasapo-producer.pc.in libasapo-producer.pc) install(FILES ${CMAKE_BINARY_DIR}/producer/libasapo-producer.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + DESTINATION lib/pkgconfig) diff --git a/producer/libasapo-producer.pc.in b/producer/libasapo-producer.pc.in index 8e6b2a70b1eff2f41d8a08a5391a9bb68dd3495a..20e389f2b185c0b4ad5f3cbf3d61df5c02853e6e 100644 --- a/producer/libasapo-producer.pc.in +++ b/producer/libasapo-producer.pc.in @@ -1,11 +1,11 @@ prefix=${CMAKE_INSTALL_PREFIX} exec_prefix=${CMAKE_INSTALL_PREFIX} -libdir=${CMAKE_INSTALL_FULL_LIBDIR} -includedir=${CMAKE_INSTALL_FULL_INCLUDEDIR} +libdir=${CMAKE_INSTALL_PREFIX}/lib +includedir=${CMAKE_INSTALL_PREFIX}/include Name: libasapo-producer Description: ASAP::O producer API Version: ${ASAPO_PRODUCER_PROTOCOL} -Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR} -Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -lasapo-producer +Cflags: -I${CMAKE_INSTALL_PREFIX}/lib +Libs: -L${CMAKE_INSTALL_PREFIX}/lib -lasapo-producer Libs.private: -lcurl -lstdc++ -lpthread