Fix x86_64 build

Do not hardcode path to /usr/lib

Change-Id: I5a356d883d150e58ffa9c894a95873ff8746d039
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 622b475..546bcc7 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,6 @@ SET(VERSION "${VERSION_MAJOR}.1.0")
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include/app-checker")
 
 # Build type : Release
@@ -57,7 +56,7 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DRW_DATA_PREFIX=\"/opt/share\"")
-
+ADD_DEFINITIONS("-DLIBPREFIX=\"${LIB_INSTALL_DIR}\"")
 # Linker flags
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 
@@ -90,7 +89,7 @@ CONFIGURE_FILE(app-checker.pc.in app-checker.pc @ONLY)
 CONFIGURE_FILE(app-checker-server.pc.in app-checker-server.pc @ONLY)
 
 
-
+MESSAGE("LIBDIR ${LIB_INSTALL_DIR}")
 ### Install ###
 INSTALL(TARGETS app-checker DESTINATION lib COMPONENT RuntimeLibraries)
 INSTALL(TARGETS ${DAEMON_NAME} DESTINATION lib COMPONENT RuntimeLibraries)

diff --git a/app-checker-server.pc.in b/app-checker-server.pc.in
index fe01845..9c4f455 100755 (executable)
--- a/app-checker-server.pc.in
+++ b/app-checker-server.pc.in
@@ -2,7 +2,7 @@
 
 prefix=/usr
 exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
+libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDEDIR@
 
 Name: libapp-checker-server

diff --git a/app-checker.pc.in b/app-checker.pc.in
index 38b85c8..7393673 100755 (executable)
--- a/app-checker.pc.in
+++ b/app-checker.pc.in
@@ -2,7 +2,7 @@
 
 prefix=/usr
 exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
+libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDEDIR@
 
 Name: libapp-checker

diff --git a/src/ac_server.c b/src/ac_server.c
index b33f368..2508bc4 100755 (executable)
--- a/src/ac_server.c
+++ b/src/ac_server.c
@@ -35,7 +35,7 @@
 #include "ac_sock.h"
 #include "internal.h"
 
-#define PLUGINS_PREFIX "/usr/lib/ac-plugins"
+#define PLUGINS_PREFIX LIBPREFIX "/ac-plugins"
 #define MAX_LOCAL_BUFSZ        512
 
 #ifndef SLPAPI