Fix install libdir and version in pc file

[Bug/Feature]   Hardcoded lib dir, no version in pc file.
[Cause]         N/A
[Solution]      N/A
[Verification]  Build, install

Change-Id: Ic36d716917cdf0dbc69f8cd63045645bf895365f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2118f07..1ee9397 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,8 @@
 CMAKE_MINIMUM_REQUIRED (VERSION 2.6.2)
 PROJECT(Config)
 
+SET(_VERSION_ "0.0.1")
+
 ## pkgconfig ###################################################################
 INCLUDE(FindPkgConfig)
 
@@ -59,6 +61,10 @@ ADD_DEFINITIONS(-DPROJECT_SOURCE_DIR="${PROJECT_SOURCE_DIR}")
 ## Subdirectories ##############################################################
 SET(SRC_FOLDER ${PROJECT_SOURCE_DIR}/src)
 
+IF(NOT DEFINED LIB_INSTALL_DIR)
+    SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
+ENDIF(NOT DEFINED LIB_INSTALL_DIR)
+
 IF(NOT DEFINED INCLUDE_INSTALL_DIR)
     SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR})
 ENDIF(NOT DEFINED INCLUDE_INSTALL_DIR)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 437e6ca..9c1d5c8 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,4 +32,4 @@ INCLUDE_DIRECTORIES(SYSTEM ${CONFIG_DEPS_INCLUDE_DIRS})
 CONFIGURE_FILE(${PC_FILE}.in "${CMAKE_CURRENT_BINARY_DIR}/${PC_FILE}" @ONLY)
 
 INSTALL(FILES ${HEADERS}                               DESTINATION "${INCLUDE_INSTALL_DIR}/sc-tools/config")
-INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PC_FILE}" DESTINATION "/usr/lib/pkgconfig")
+INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PC_FILE}" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")

diff --git a/src/libConfig.pc.in b/src/libConfig.pc.in
index 67f53d6..d18f860 100644 (file)
--- a/src/libConfig.pc.in
+++ b/src/libConfig.pc.in
@@ -4,5 +4,5 @@ includedir=@INCLUDE_INSTALL_DIR@
 
 Name: libConfig
 Description: Config library
-Version: @VERSION@
+Version: @_VERSION_@
 Cflags: -I${includedir}/sc_tools