Fix for 64 bit compatibility.

- Fix hardcoding path.
- Use %cmake to set default paths.

Change-Id: I96831b6c15575ea9d696d93128183f35390911dd

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 2cae7c1..8254b93
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
 ADD_DEFINITIONS(-DDP_SUPPORT_DBUS_ACTIVATION)
 
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
 
 SET(SOURCES src/download-wrapping.c)
 MESSAGE(STATUS "SOURCES : ${SOURCES}")
@@ -43,7 +43,7 @@ TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS})
 SET_TARGET_PROPERTIES(${fw_name} PROPERTIES VERSION ${VERSION})
 SET_TARGET_PROPERTIES(${fw_name} PROPERTIES SOVERSION ${VERSION_MAJOR})
 
-INSTALL(TARGETS ${fw_name} DESTINATION lib)
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(
         DIRECTORY ${INC_DIR}/ DESTINATION include/web
         FILES_MATCHING
@@ -66,7 +66,7 @@ CONFIGURE_FILE(
     ${fw_name}
     @ONLY
 )
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name} DESTINATION share/license)
 
 IF(UNIX)

diff --git a/capi-web-url-download.pc.in b/capi-web-url-download.pc.in
index 2ecfef5..ebd57ce 100644 (file)
--- a/capi-web-url-download.pc.in
+++ b/capi-web-url-download.pc.in
@@ -3,7 +3,7 @@
 
 prefix=@PREFIX@
 exec_prefix=/usr
-libdir=/usr/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=/usr/include/web
 
 Name: @PC_NAME@

diff --git a/packaging/capi-web-url-download.spec b/packaging/capi-web-url-download.spec
index f0c9a8c..32d14b3 100755 (executable)
--- a/packaging/capi-web-url-download.spec
+++ b/packaging/capi-web-url-download.spec
@@ -27,7 +27,7 @@ CAPI for content downloading with web url (developement files)
 %setup -q
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX="/"
+%cmake .
 
 make %{?jobs:-j%jobs}