summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-02-20 18:37:50 (GMT)
committer Vincent Sanders <vince@kyllikki.org>2016-02-20 18:37:50 (GMT)
commit6a4efa35f815b85c5e59b3781263a956fab8d86d (patch)
tree1fe3459167ac4188db94c1afddd601aa277e1336 /gtk
parent592ff0ef76199e4cc5089e7e76036ae259bcdcd2 (diff)
downloadnetsurf-6a4efa35f815b85c5e59b3781263a956fab8d86d.tar.gz
netsurf-6a4efa35f815b85c5e59b3781263a956fab8d86d.tar.bz2
update gtk resource path setting to use makefile variable
Diffstat (limited to 'gtk')
-rw-r--r--gtk/Makefile.defaults2
-rw-r--r--gtk/gui.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/gtk/Makefile.defaults b/gtk/Makefile.defaults
index 0f229d8..d97bc23 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 28e5c3c..7ad18b4 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);
}