From 6a4efa35f815b85c5e59b3781263a956fab8d86d Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Sat, 20 Feb 2016 18:37:50 +0000
Subject: update gtk resource path setting to use makefile variable

---
 gtk/Makefile.defaults | 2 +-
 gtk/gui.c             | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gtk/Makefile.defaults b/gtk/Makefile.defaults
index 0f229d8c2..d97bc2323 100644
--- a/gtk/Makefile.defaults
+++ b/gtk/Makefile.defaults
@@ -4,7 +4,7 @@
 
 # Where to search for NetSurf's resources after looking in ~/.netsurf and
 # $NETSURFRES.  It must have a trailing /
-NETSURF_GTK_RESOURCES := $(PREFIX)/share/netsurf/
+NETSURF_GTK_RESOURCES := $(PREFIX)/share/netsurf/:./gtk/res/
 
 # Where to install the netsurf binary
 NETSURF_GTK_BIN := $(PREFIX)/bin/
diff --git a/gtk/gui.c b/gtk/gui.c
index 28e5c3c90..7ad18b499 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -116,7 +116,7 @@ nsgtk_init_resource_path(const char *config_home)
 
 	if (config_home != NULL) {
 		resource_path_len = snprintf(NULL, 0,
-					     "%s:${NETSURFRES}:%s:./gtk/res",
+					     "%s:${NETSURFRES}:%s",
 					     config_home,
 					     GTK_RESPATH);
 		resource_path = malloc(resource_path_len + 1);
@@ -124,12 +124,12 @@ nsgtk_init_resource_path(const char *config_home)
 			return NULL;
 		}
 		snprintf(resource_path, resource_path_len + 1,
-			 "%s:${NETSURFRES}:%s:./gtk/res",
+			 "%s:${NETSURFRES}:%s",
 			 config_home,
 			 GTK_RESPATH);
 	} else {
 		resource_path_len = snprintf(NULL, 0,
-					     "${NETSURFRES}:%s:./gtk/res",
+					     "${NETSURFRES}:%s",
 					     GTK_RESPATH);
 		resource_path = malloc(resource_path_len + 1);
 		if (resource_path == NULL) {
@@ -137,7 +137,7 @@ nsgtk_init_resource_path(const char *config_home)
 		}
 		snprintf(resource_path,
 			 resource_path_len + 1,
-			 "${NETSURFRES}:%s:./gtk/res",
+			 "${NETSURFRES}:%s",
 			 GTK_RESPATH);
 	}
 
-- 
cgit v1.2.3