From: Alberto Garcia <berto@igalia.com>
Date: Fri, 6 Mar 2015 07:33:11 +0000 (+0000)
Subject: Install the MiniBrowser binary
X-Git-Tag: archive/raspbian/2.14.3-1+rpi1~1^2^2^2~30
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8b0284db74cf1066d7c2da53d0fa94887db45054;p=webkit2gtk.git

Install the MiniBrowser binary

===================================================================

Gbp-Pq: Name install-minibrowser.patch
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3926cdcfb..4f69148a53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,3 +184,4 @@ add_subdirectory(Source)
 if (ENABLE_TOOLS)
     add_subdirectory(Tools)
 endif ()
+add_subdirectory(Tools/MiniBrowser/gtk)
diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
index c96509d7c3..f6d80d645d 100644
--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
@@ -52,3 +52,4 @@ include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
 add_executable(MiniBrowser ${MiniBrowser_SOURCES})
 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
 set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
+install(TARGETS MiniBrowser DESTINATION "${LIBEXEC_INSTALL_DIR}")
diff --git a/Tools/MiniBrowser/gtk/main.c b/Tools/MiniBrowser/gtk/main.c
index 9418ca6615..68b4e915da 100644
--- a/Tools/MiniBrowser/gtk/main.c
+++ b/Tools/MiniBrowser/gtk/main.c
@@ -240,7 +240,6 @@ aboutURISchemeRequestCallback(WebKitURISchemeRequest *request, gpointer userData
 int main(int argc, char *argv[])
 {
     gtk_init(&argc, &argv);
-    g_setenv("WEBKIT_INJECTED_BUNDLE_PATH", WEBKIT_INJECTED_BUNDLE_PATH, FALSE);
 
     const gchar *multiprocess = g_getenv("MINIBROWSER_MULTIPROCESS");
     if (multiprocess && *multiprocess) {