From 1de0ebf2e50603859ec18cfd94472b3041d381e8 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Wed, 5 Oct 2016 19:44:49 +0100
Subject: fix gtk install target to cope with gtk3

---
 frontends/gtk/Makefile          | 29 +++++++++++++++++++----------
 frontends/gtk/Makefile.defaults |  2 +-
 2 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'frontends/gtk')

diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile
index f9273f1db..76ef9982c 100644
--- a/frontends/gtk/Makefile
+++ b/frontends/gtk/Makefile
@@ -40,7 +40,7 @@ GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
 		-D_XOPEN_SOURCE=600 \
 		-D_POSIX_C_SOURCE=200809L \
 		-D_NETBSD_SOURCE \
-		-DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\"
+		-DGTK_RESPATH=\"$(NETSURF_GTK_RES_PATH)\"
 
 # non optional pkg-configed libs
 $(eval $(call pkg_config_find_and_add,gtk+-$(NETSURF_GTK_MAJOR).0,GTK-$(NETSURF_GTK_MAJOR)))
@@ -58,8 +58,14 @@ LDFLAGS += -lm
 # Path to GTK resources
 NSGTK_RESOURCES_DIR := $(FRONTEND_RESOURCES_DIR)
 
-# The gtk binary target
-EXETARGET := nsgtk
+# The gtk binary target.
+ifeq ($(NETSURF_GTK_MAJOR),2)
+    # gtk2 builds have no major suffix
+    EXETARGET := nsgtk
+else
+    # gtk3 and later builds use the major version suffix
+    EXETARGET := nsgtk$(NETSURF_GTK_MAJOR)
+endif
 
 # The filter and target for split messages
 MESSAGES_FILTER=gtk
@@ -188,15 +194,18 @@ GTK_RESOURCES_LIST := \
 # translations with more than just Messages files
 GTK_TRANSLATIONS_HTML := de en fr it ja nl
 
+# destination for installed resources is the first entry in the gtk resource path
+NSGTK_RESOURCES_DESTDIR := $(DESTDIR)$(word 1,$(subst :, ,$(NETSURF_GTK_RES_PATH)))
+
 install-gtk:
 	$(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)
-	$(Q)install nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf
-	$(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons
-	$(Q)install -m 0644 $(NSGTK_RESOURCES_DIR)/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/icons
-	$(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
-	$(Q)install -m 0644 $(NSGTK_RESOURCES_DIR)/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/throbber
-	$(Q)tar -c -h -C $(NSGTK_RESOURCES_DIR) -f - $(GTK_TRANSLATIONS_HTML) | tar -xv -C $(DESTDIR)$(NETSURF_GTK_RESOURCES) -f -
-	$(Q)install -m 0644 $(GTK_RESOURCES_LIST) $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+	$(Q)install $(EXETARGET) $(DESTDIR)$(NETSURF_GTK_BIN)netsurf-gtk$(SUBTARGET)
+	$(Q)mkdir -p $(NSGTK_RESOURCES_DESTDIR)/icons
+	$(Q)install -m 0644 $(NSGTK_RESOURCES_DIR)/icons/*.png $(NSGTK_RESOURCES_DESTDIR)/icons
+	$(Q)mkdir -p $(NSGTK_RESOURCES_DESTDIR)/throbber
+	$(Q)install -m 0644 $(NSGTK_RESOURCES_DIR)/throbber/*.png $(NSGTK_RESOURCES_DESTDIR)/throbber
+	$(Q)tar -c -h -C $(NSGTK_RESOURCES_DIR) -f - $(GTK_TRANSLATIONS_HTML) | tar -xv -C $(NSGTK_RESOURCES_DESTDIR) -f -
+	$(Q)install -m 0644 $(GTK_RESOURCES_LIST) $(NSGTK_RESOURCES_DESTDIR)
 
 # ----------------------------------------------------------------------------
 # Package target
diff --git a/frontends/gtk/Makefile.defaults b/frontends/gtk/Makefile.defaults
index fc352a020..a98043eb9 100644
--- a/frontends/gtk/Makefile.defaults
+++ b/frontends/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/:./frontends/gtk/res/
+NETSURF_GTK_RES_PATH := $(PREFIX)/share/netsurf/:./frontends/gtk/res/
 
 # Where to install the netsurf binary
 NETSURF_GTK_BIN := $(PREFIX)/bin/
-- 
cgit v1.2.3