[GTK] Unify webkitgtk and webkit2gtk directories
authorberto@igalia.com <berto@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 25 Aug 2014 13:05:31 +0000 (13:05 +0000)
committerberto@igalia.com <berto@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 25 Aug 2014 13:05:31 +0000 (13:05 +0000)
https://bugs.webkit.org/show_bug.cgi?id=136209

Reviewed by Carlos Garcia Campos.

Use webkit2gtk-X.X both for the process binaries and the injected
bundle.

* Source/cmake/OptionsGTK.cmake:

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

ChangeLog
Source/cmake/OptionsGTK.cmake

index c85d626..3952eaa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2014-08-25  Alberto Garcia  <berto@igalia.com>
+
+        [GTK] Unify webkitgtk and webkit2gtk directories
+        https://bugs.webkit.org/show_bug.cgi?id=136209
+
+        Reviewed by Carlos Garcia Campos.
+
+        Use webkit2gtk-X.X both for the process binaries and the injected
+        bundle.
+
+        * Source/cmake/OptionsGTK.cmake:
+
 2014-08-24  Ryuan Choi  <ryuan.choi@samsung.com>
 
         [EFL] Move Efl specific code from Source/CMakeLists.txt
index aa7381a..377b819 100644 (file)
@@ -20,7 +20,7 @@ set(ENABLE_WAYLAND_TARGET OFF CACHE BOOL "Whether to enable support for the Wayl
 # CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
 set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to library installation directory")
 set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory")
-set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/webkitgtk-${WEBKITGTK_API_VERSION}" CACHE PATH "Absolute path to install executables executed by the library")
+set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/webkit2gtk-${WEBKITGTK_API_VERSION}" CACHE PATH "Absolute path to install executables executed by the library")
 
 set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
 set(DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/webkitgtk-${WEBKITGTK_API_VERSION}")