Remove hardcoded lib path

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 591cd8c..2a6b5d3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,8 +47,8 @@ SET(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
 
-SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 INCLUDE(WebKitMacros)

diff --git a/Source/WebKit/efl/ewebkit.pc.in b/Source/WebKit/efl/ewebkit.pc.in
index 8fb4d18..39bcf3d 100644 (file)
--- a/Source/WebKit/efl/ewebkit.pc.in
+++ b/Source/WebKit/efl/ewebkit.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 datadir=/opt/data/@WebKit_LIBRARY_NAME@-@PROJECT_VERSION_MAJOR@
 

diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake
index f49b67d..b4b8d18 100755 (executable)
--- a/Source/WebKit2/PlatformEfl.cmake
+++ b/Source/WebKit2/PlatformEfl.cmake
@@ -284,7 +284,7 @@ SET (EWebKit2_HEADERS
     "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_web_application_icon_data.h"
 )
 
-INSTALL(FILES ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 INSTALL(FILES ${EWebKit2_HEADERS} DESTINATION include/${WebKit2_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})
 
 INCLUDE_DIRECTORIES(${THIRDPARTY_DIR}/gtest/include)

diff --git a/Source/WebKit2/efl/ewebkit2.pc.in b/Source/WebKit2/efl/ewebkit2.pc.in
index fb5739b..d32cc0d 100755 (executable)
--- a/Source/WebKit2/efl/ewebkit2.pc.in
+++ b/Source/WebKit2/efl/ewebkit2.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 datadir=${prefix}/share/@WebKit2_LIBRARY_NAME@-@PROJECT_VERSION_MAJOR@
 

diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
index 77e690c..2615b2d 100644 (file)
--- a/Source/cmake/OptionsCommon.cmake
+++ b/Source/cmake/OptionsCommon.cmake
@@ -33,7 +33,5 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND ${LOWERCASE_CMAKE_HOST_SYSTEM_
     SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-keep-memory")
 ENDIF ()
 
-SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
-
-SET(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Where to install libraries (lib${LIB_SUFFIX})")
+SET(LIB_INSTALL_DIR "${LIB_INSTALL_DIR}" CACHE PATH "Where to install libraries (${LIB_INSTALL_DIR})")
 SET(EXEC_INSTALL_DIR "bin" CACHE PATH "Where to install executables")

diff --git a/packaging/webkit2-efl.spec b/packaging/webkit2-efl.spec
index 72d849b..6753b5b 100644 (file)
--- a/packaging/webkit2-efl.spec
+++ b/packaging/webkit2-efl.spec
@@ -146,10 +146,10 @@ cd $WEBKIT_BUILD_DIR
 export MAKE_OPTION=%{MAKE_OPTION}
 if [ "{MAKE_OPTION}" == "${MAKE_OPTION#%}" ]
 then
-    cmake $SOURCE_DIR -DPORT=Efl -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DENABLE_WEBKIT=Off -DENABLE_WEBKIT2=On -DENABLE_ALLINONE=On -DENABLE_TIZEN_SCREEN_READER=Off -DEFL_TARGET=%{EFL_TARGET} -DDefaultTheme_RESOURCE_NAME=webkit.edj $TIZEN_WEBKIT_EXTRA_OPTIONS $GSTREAMER_API $ECORE_X
-    make %{?jobs:-j%jobs}
+    %cmake $SOURCE_DIR -DPORT=Efl -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DENABLE_WEBKIT=Off -DENABLE_WEBKIT2=On -DENABLE_ALLINONE=On -DENABLE_TIZEN_SCREEN_READER=Off -DEFL_TARGET=%{EFL_TARGET} -DDefaultTheme_RESOURCE_NAME=webkit.edj $TIZEN_WEBKIT_EXTRA_OPTIONS $GSTREAMER_API $ECORE_X
+    make %{?_smp_mflags}
 else
-    make %{MAKE_OPTION} %{?jobs:-j%jobs}
+    make %{MAKE_OPTION} %{?_smp_mflags}
 fi
 
 %install