Fix the installation location of the pkg-config files

This adjusts the paths of the pkg-config files so that they match
the installation locations of the actual libraries (always in
prefix/lib, not prefix/lib64).  It also fixes the paths within the
pkg-config files themselves, which were incorrect.

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)

consumer/libasapo-consumer.pc.in

 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

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)

producer/libasapo-producer.pc.in

 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