Buildsystem: Fix paths

Fix library and include paths in pkg-config, CMakeLists.txt and the
CMake config files.

CMakeLists.txt

@@ -17,8 +17,9 @@ endif()
 
 #variables for pkg-config
 set(prefix "${CMAKE_INSTALL_PREFIX}")
-set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
+set(libdir "${CMAKE_INSTALL_LIBDIR}")
 set(version "${CJSON_VERSION}")
+set(includedir "${CMAKE_INSTALL_INCLUDEDIR}")
 
 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 

cJSONConfig.cmake.in

@@ -8,7 +8,7 @@ set(CJSON_UTILS_LIBRARY @CJSON_UTILS_LIB@)
 # The cJSON library
 set(CJSON_LIBRARY @CJSON_LIB@)
 # The include directories used by cJSON
-set(CJSON_INCLUDE_DIRS @CMAKE_INSTALL_PREFIX@/include)
+set(CJSON_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@")
 
 get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
 include("${_dir}/cJSONConfigTargets.cmake")

cJSONConfigVersion.cmake.in

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "@PROJECT_VERSION@")
+set(PACKAGE_VERSION "@CJSON_VERSION@")
 
 # Check whether the requested PACKAGE_FIND_VERSION is compatible
 if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")

libcjson.pc.in

@@ -1,10 +1,9 @@
 prefix=@prefix@
-libdir=@libdir@
-includedir=${prefix}/include/cJSON
-version=@version@
+libdir=${prefix}/@libdir@
+includedir=${prefix}/@includedir@
 
 Name: libcjson
-Version: ${version}
+Version: @version@
 Description: Ultralightweight JSON parser in ANSI C
 Libs: -L${libdir} -lcjson
 Cflags: -I${includedir}

libcjson_utils.pc.in

@@ -1,10 +1,9 @@
 prefix=@prefix@
-libdir=@libdir@
-includedir=${prefix}/include/cJSON
-version=@version@
+libdir=${prefix}/@libdir@
+includedir=${prefix}/@includedir@
 
 Name: libcjson_utils
-Version: ${version}
+Version: @version@
 Description: An implementation of JSON Pointer, Patch and Merge Patch based on cJSON.
 Libs: -L${libdir} -lcjson_utils
 Cflags: -I${includedir}