Install the MiniBrowser binary
authorAlberto Garcia <berto@igalia.com>
Fri, 6 Mar 2015 07:33:11 +0000 (07:33 +0000)
committerAlberto Garcia <berto@igalia.com>
Fri, 6 Mar 2015 07:33:11 +0000 (07:33 +0000)
===================================================================

Gbp-Pq: Name install-minibrowser.patch

CMakeLists.txt
Tools/MiniBrowser/gtk/CMakeLists.txt
Tools/MiniBrowser/gtk/main.c

index e3926cdcfba5123ecb221cc5921c7009a5c3e59c..4f69148a53429c819aaf2fa4fa94fcd5ee0f5268 100644 (file)
@@ -184,3 +184,4 @@ add_subdirectory(Source)
 if (ENABLE_TOOLS)
     add_subdirectory(Tools)
 endif ()
+add_subdirectory(Tools/MiniBrowser/gtk)
index c96509d7c396479508b2d8e29a0a5c90dee8203d..f6d80d645d714293bd6e3093ab5e32276df1ffab 100644 (file)
@@ -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}")
index 9418ca66154ccbdfa04228cb954dc2775eee7f64..68b4e915da38561e1df67faad3b87ab68738947f 100644 (file)
@@ -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) {