Build script fix for 64-bit support

Change-Id: If01e757a85f296fa167ef0d5343dd9751d19aaae
Signed-off-by: Mu-Woong <muwoong.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5eb4f77..6df2e6c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(clips)
+INCLUDE(GNUInstallDirs)
 
 # Targets
 SET(target "clips")
@@ -8,14 +9,12 @@ SET(target "clips")
 FILE(GLOB_RECURSE SRCS src/*.cpp src/*.c)
 
 # Common Options
-SET(CMAKE_INSTALL_PREFIX /usr)
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 INCLUDE(FindPkgConfig)
 INCLUDE_DIRECTORIES(
        /usr/include
        /usr/include/glib-2.0
 )
-ADD_DEFINITIONS(-g -O2 -Wall -fPIC -fvisibility=default -Wl,--as-needed -Wl,--rpath=/usr/lib)
+ADD_DEFINITIONS(-g -O2 -Wall -fPIC -fvisibility=default -Wl,--as-needed)
 
 ADD_LIBRARY(${target} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${target} -lc -lm)
@@ -23,14 +22,17 @@ SET_TARGET_PROPERTIES(${target} PROPERTIES SOVERSION ${MAJORVER})
 SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${FULLVER})
 
 # Installing Daemon
-INSTALL(TARGETS ${target} DESTINATION lib)
+INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries)
 INSTALL(
-       DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/ DESTINATION include/clips
+       DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clips
        FILES_MATCHING PATTERN "*.h"
 )
 
+SET(VERSION ${FULLVER})
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(PC_NAME ${PROJECT_NAME})
-SET(PC_INCLUDE "/usr/include")
+SET(PC_INCLUDE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
+SET(PC_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 SET(PC_DESCRIPTION "CLIPS")
 SET(PC_LDFLAGS -l${target})
 SET(PC_CFLAGS -I\${includedir})
@@ -40,4 +42,4 @@ CONFIGURE_FILE(
        ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc
        @ONLY
 )
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

diff --git a/clips.pc.in b/clips.pc.in
index 50edac1..378b991 100644 (file)
--- a/clips.pc.in
+++ b/clips.pc.in
@@ -1,8 +1,8 @@
 #Package Information for pkg-config
 
 prefix=@PREFIX@
-exec_prefix=/usr
-libdir=/usr/lib
+exec_prefix=@PREFIX@
+libdir=@PC_LIBDIR@
 includedir=@PC_INCLUDE@
 
 Name: @PC_NAME@

diff --git a/packaging/clips.spec b/packaging/clips.spec
index 23e60ff..dd27d23 100644 (file)
--- a/packaging/clips.spec
+++ b/packaging/clips.spec
@@ -49,7 +49,7 @@ rm -rf %{buildroot}
 %files
 %manifest packaging/%{name}.manifest
 %defattr(-,root,root,-)
-/usr/lib/*.so*
+%{_libdir}/*.so*
 
 %package devel
 Summary:    CLIPS (Development)