From 26fdf229e28aa5dda851504c1d1a4af54989f318 Mon Sep 17 00:00:00 2001
From: anthony <anthony@localhost>
Date: Thu, 10 Jun 2021 20:27:36 +0100
Subject: [PATCH] Update for latest merge

---
 frontends/Makefile.hts           | 2 +-
 frontends/gnustep/Makefile       | 2 +-
 frontends/gnustep/Makefile.tools | 7 +++++++
 gnustepbuild.sh                  | 3 +--
 4 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 frontends/gnustep/Makefile.tools

diff --git a/frontends/Makefile.hts b/frontends/Makefile.hts
index b5af240f1..b9436acc3 100644
--- a/frontends/Makefile.hts
+++ b/frontends/Makefile.hts
@@ -114,7 +114,7 @@ else
 endif
 
 # valid values for the TARGET
-VLDTARGET := amiga atari beos framebuffer gtk monkey riscos windows
+VLDTARGET := amiga atari beos framebuffer gtk monkey riscos windows gnustep
 
 # Check for valid TARGET
 ifeq ($(filter $(VLDTARGET),$(TARGET)),)
diff --git a/frontends/gnustep/Makefile b/frontends/gnustep/Makefile
index 4e88fe1e7..cabb9f149 100644
--- a/frontends/gnustep/Makefile
+++ b/frontends/gnustep/Makefile
@@ -79,7 +79,7 @@ SOURCES = $(addprefix $(shell pwd)/,$(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRON
 
 # Since we prefix the sources with the pwd, also create a special
 # prefixed rule so that the testament is run
-$(shell pwd)/content/fetchers/about.c: testament
+$(shell pwd)/content/fetchers/about/about.c: testament
 
 EXETARGET := NetSurf
 
diff --git a/frontends/gnustep/Makefile.tools b/frontends/gnustep/Makefile.tools
new file mode 100644
index 000000000..df31e7955
--- /dev/null
+++ b/frontends/gnustep/Makefile.tools
@@ -0,0 +1,7 @@
+# -*- mode: makefile-gmake -*-
+##
+## tool setup for the gnustep target
+##
+
+# use native package config
+PKG_CONFIG := pkg-config
\ No newline at end of file
diff --git a/gnustepbuild.sh b/gnustepbuild.sh
index df7c4353a..f1393731b 100755
--- a/gnustepbuild.sh
+++ b/gnustepbuild.sh
@@ -1,3 +1,2 @@
 #!/bin/sh
-export PKG_CONFIG_PATH="/opt/netsurf/lib/pkgconfig/"
-gmake TARGET=gnustep NETSURF_USE_DUKTAPE=NO NETSURF_USE_NSSVG=AUTO NETSURF_USE_ROSPRITE=AUTO 
+make TARGET=gnustep NETSURF_USE_DUKTAPE=NO NETSURF_USE_NSSVG=YES NETSURF_USE_ROSPRITE=AUTO