Title: [186852] trunk/Source/WebKit2
- Revision
- 186852
- Author
- mcatanz...@igalia.com
- Date
- 2015-07-15 13:34:17 -0700 (Wed, 15 Jul 2015)
Log Message
[GTK] Rename LIBEXECDIR to PKGLIBEXECDIR
https://bugs.webkit.org/show_bug.cgi?id=140070
Reviewed by Martin Robinson.
The path that's currently stored in LIBEXECDIR is one level lower than
the real LIBEXECDIR, which we are going to need. Introduce PKGLIBEXECDIR
so that we can use LIBEXECDIR for the real LIBEXECDIR in the future.
* PlatformGTK.cmake:
* Shared/gtk/ProcessExecutablePathGtk.cpp:
(WebKit::findWebKitProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186851 => 186852)
--- trunk/Source/WebKit2/ChangeLog 2015-07-15 18:32:29 UTC (rev 186851)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-15 20:34:17 UTC (rev 186852)
@@ -1,3 +1,18 @@
+2015-07-15 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [GTK] Rename LIBEXECDIR to PKGLIBEXECDIR
+ https://bugs.webkit.org/show_bug.cgi?id=140070
+
+ Reviewed by Martin Robinson.
+
+ The path that's currently stored in LIBEXECDIR is one level lower than
+ the real LIBEXECDIR, which we are going to need. Introduce PKGLIBEXECDIR
+ so that we can use LIBEXECDIR for the real LIBEXECDIR in the future.
+
+ * PlatformGTK.cmake:
+ * Shared/gtk/ProcessExecutablePathGtk.cpp:
+ (WebKit::findWebKitProcess):
+
2015-07-15 Daniel Bates <daba...@apple.com>
[Mac][WK2] Videos should only have access to cookies when -[NSURLRequest HTTPShouldHandleCookies] is YES
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (186851 => 186852)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2015-07-15 18:32:29 UTC (rev 186851)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2015-07-15 20:34:17 UTC (rev 186852)
@@ -15,7 +15,7 @@
add_definitions(-DBUILDING_WEBKIT)
add_definitions(-DWEBKIT2_COMPILATION)
-add_definitions(-DLIBEXECDIR="${LIBEXEC_INSTALL_DIR}")
+add_definitions(-DPKGLIBEXECDIR="${LIBEXEC_INSTALL_DIR}")
add_definitions(-DPACKAGE_LOCALE_DIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
add_definitions(-DLIBDIR="${LIB_INSTALL_DIR}")
Modified: trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp (186851 => 186852)
--- trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp 2015-07-15 18:32:29 UTC (rev 186851)
+++ trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp 2015-07-15 20:34:17 UTC (rev 186852)
@@ -66,7 +66,7 @@
}
#endif
- return pathByAppendingComponent(filenameToString(LIBEXECDIR), processName);
+ return pathByAppendingComponent(filenameToString(PKGLIBEXECDIR), processName);
}
String executablePathOfWebProcess()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
