Do Not Hardcode bin/lib Dir.

This breaks build in x64/aarch64.

Change-Id: I8585f01799ce0bada64d5f68826656511ad0d8b1
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: Geunsik Lim <geunsik.lim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbfd756db6e61e79dfd9e6b8c67fded078c3c851..3b185a0cd2d52235846fe6dab39a1110c01a75c0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,9 @@ PROJECT(efl-extension C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_DIR ${PREFIX})
-SET(BINDIR ${PREFIX}/bin)
+SET(BINDIR ${BIN_INSTALL_DIR})
 
-SET(LIBDIR ${PREFIX}/lib)
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCDIR ${PREFIX}/include)
 
 SET(UNIFIED_IMGDIR ${PREFIX}/share/${PROJECT_NAME}/images)
@@ -70,10 +70,10 @@ 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)
 
 #INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/images/ DESTINATION ${UNIFIED_IMGDIR} FILES_MATCHING PATTERN "*.png")
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/mobile/images/ DESTINATION ${MOBILE_IMGDIR} FILES_MATCHING PATTERN "*.png")

diff --git a/packaging/efl-extension.spec b/packaging/efl-extension.spec
index 8cde08e670cc4ceb747c2387eb47fce82c6761d4..9923333edbb02075ba28927164c60c43b3772063 100644 (file)
--- a/packaging/efl-extension.spec
+++ b/packaging/efl-extension.spec
@@ -59,15 +59,14 @@ EFL extension library providing small utility functions (devel)
 export CFLAGS+=" -fvisibility=hidden -fPIC -Wall"
 export LDFLAGS+=" -fvisibility=hidden -Wl,-z,defs -Wl,--hash-style=both -Wl,--as-needed"
 
+cmake . -DLIB_INSTALL_DIR:PATH=%{_libdir} \
+       -DBIN_INSTALL_DIR:PATH=%{_bindir} \
 %if "%{?server}" == "x"
-cmake \
-       . -DCMAKE_INSTALL_PREFIX=/usr -DWITH_X=1
+       -DCMAKE_INSTALL_PREFIX=/usr -DWITH_X=1
 %else if "%{?server}" == "wayland"
-cmake \
-       . -DCMAKE_INSTALL_PREFIX=/usr -DWITH_WAYLAND=1
+       -DCMAKE_INSTALL_PREFIX=/usr -DWITH_WAYLAND=1
 %else
-cmake \
-       . -DCMAKE_INSTALL_PREFIX=/usr
+       -DCMAKE_INSTALL_PREFIX=/usr
 %endif
 
 make %{?jobs:-j%jobs}

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2220113701ca747ae1215353c899923f4fa8f407..315ba23839dd50521ab741ba24c395dbeef8d2b6 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -128,5 +128,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 ${LIBDIR})
 #INSTALL(FILES ${ALL_EO_FILES} DESTINATION share/eolian/include/efl-extension)