fix x86_64 build
authorMichael Leibowitz <michael.leibowitz@intel.com>
Wed, 9 Oct 2013 00:26:32 +0000 (17:26 -0700)
committerMichael Leibowitz <michael.leibowitz@intel.com>
Wed, 9 Oct 2013 00:27:16 +0000 (17:27 -0700)
switch from using lib in destination to ${LIB_INSTALL_DIR}

Change-Id: I4c1ea98a25db357c6196cd7ab2fd820e64d9f426
Signed-off-by: Michael Leibowitz <michael.leibowitz@intel.com>
client/CMakeLists.txt
common/CMakeLists.txt

index 2fbe8a8..cf5ab28 100644 (file)
@@ -23,9 +23,9 @@ FILE(GLOB CLIENT_HEADER include/*.h)
 SET(CLIENT_HEADER ${CLIENT_HEADER} ${CMAKE_SOURCE_DIR}/common/include/net_nfc_typedef.h)
 
 CONFIGURE_FILE(${NFC_CLIENT}.pc.in ${NFC_CLIENT}.pc @ONLY)
-INSTALL(FILES ${NFC_CLIENT}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${NFC_CLIENT}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
-INSTALL(TARGETS ${NFC_CLIENT} DESTINATION lib)
+INSTALL(TARGETS ${NFC_CLIENT} DESTINATION ${LIB_INSTALL_DIR})
 
 FOREACH(hfile ${CLIENT_HEADER})
        INSTALL(FILES ${hfile} DESTINATION include/${NFC_CLIENT})
index bc7510d..978b0ec 100644 (file)
@@ -26,7 +26,7 @@ TARGET_LINK_LIBRARIES(${NFC_COMMON} ${common_pkgs_LDFLAGS})
 FILE(GLOB COMMON_HEADER include/*.h)
 
 CONFIGURE_FILE(${NFC_COMMON}.pc.in ${NFC_COMMON}.pc @ONLY)
-INSTALL(FILES ${NFC_COMMON}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${NFC_COMMON}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 FOREACH(hfile ${COMMON_HEADER})
         INSTALL(FILES ${hfile} DESTINATION include/${NFC_COMMON})