PTREL-400: fix build in x86_64

use %cmake macro in spec files, use LIB_INSTALL_DIR
for install path instead of hardcoded /lib

Change-Id: I44b6bb09e56c2956e78564fcc55e6f7406e22cee
Signed-off-by: Stephane Desneux <stephane.desneux@eurogiciel.fr>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13616ea..de88413 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(efl-assist C)
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_DIR ${PREFIX})
 SET(BINDIR ${PREFIX}/bin)
-SET(LIBDIR ${PREFIX}/lib)
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCDIR ${PREFIX}/include)
 SET(VERSION_MAJOR 0)
 SET(VERSION ${VERSION_MAJOR}.1.0)
@@ -41,7 +41,7 @@ ADD_SUBDIRECTORY(src)
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIBDIR}")
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIBDIR}/pkgconfig)

diff --git a/packaging/efl-assist.spec b/packaging/efl-assist.spec
index 7c26f59..05b8bb7 100644 (file)
--- a/packaging/efl-assist.spec
+++ b/packaging/efl-assist.spec
@@ -38,7 +38,7 @@ EFL assist library providing small utility functions (devel)
 %build
 export CFLAGS+=" -fvisibility=hidden"
 export LDFLAGS+=" -fvisibility=hidden"
-cmake . -DCMAKE_INSTALL_PREFIX=/usr
+%cmake . -DCMAKE_INSTALL_PREFIX=/usr
 
 make %{?jobs:-j%jobs}
 

diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index b647f6f..4ea6fe0 100644 (file)
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -18,5 +18,5 @@ SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${VERSION})
 SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
 TARGET_LINK_LIBRARIES(${LIB_NAME} ${LIB_PKGS_LDFLAGS} ${LIB_TARGET_PKGS_LDFLAGS})
 
-INSTALL(TARGETS ${LIB_NAME} DESTINATION lib)
+INSTALL(TARGETS ${LIB_NAME} DESTINATION ${LIB_INSTALL_DIR})