[EFL] Move DATA_INSTALL_DIR to ewebkit2-0

https://bugs.webkit.org/show_bug.cgi?id=135553

Reviewed by Gyuyoung Kim.

Since WebKit1/Efl is dropped, we don't need to use ewebkit-1 and ewebkit2-1.
And removed WebKit_OUTPUT_NAME variable which is not used anymore on the EFL port.

* Source/cmake/OptionsEfl.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@171985 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 083806c..831a3ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2014-08-03  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Move DATA_INSTALL_DIR to ewebkit2-0
+        https://bugs.webkit.org/show_bug.cgi?id=135553
+
+        Reviewed by Gyuyoung Kim.
+
+        Since WebKit1/Efl is dropped, we don't need to use ewebkit-1 and ewebkit2-1.
+        And removed WebKit_OUTPUT_NAME variable which is not used anymore on the EFL port.
+
+        * Source/cmake/OptionsEfl.cmake:
+
 2014-08-01  Bear Travis  <betravis@adobe.com>
 
         [Feature Queries] Enable Feature Queries on EFL/GTK

diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
index cc980a1..c17e752 100644 (file)
--- a/Source/cmake/OptionsEfl.cmake
+++ b/Source/cmake/OptionsEfl.cmake
@@ -38,10 +38,9 @@ set(WTF_LIBRARY_TYPE STATIC)
 set(WTF_OUTPUT_NAME wtf_efl)
 set(JavaScriptCore_OUTPUT_NAME javascriptcore_efl)
 set(WebCore_OUTPUT_NAME webcore_efl)
-set(WebKit_OUTPUT_NAME ewebkit)
 set(WebKit2_OUTPUT_NAME ewebkit2)
 
-set(DATA_INSTALL_DIR "share/${WebKit_OUTPUT_NAME}-${PROJECT_VERSION_MAJOR}" CACHE PATH "Installation path for theme data")
+set(DATA_INSTALL_DIR "share/${WebKit2_OUTPUT_NAME}-${PROJECT_VERSION_MAJOR}" CACHE PATH "Installation path for theme data")
 set(THEME_BINARY_DIR ${CMAKE_BINARY_DIR}/WebCore/platform/efl/DefaultTheme)
 file(MAKE_DIRECTORY ${THEME_BINARY_DIR})