From 4659b518cb8a47101da6e886c254e0223909621e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20R=C3=B6nnquist?= <unknown>
Date: Tue, 28 Jul 2020 14:28:46 +1000
Subject: Backport: Bug [#2189]. Allow cross-building for GTK by choosing
 pkg-config.

Backport of changeset 8463:714e73622572.
---
 doc/ScintillaHistory.html | 4 ++++
 gtk/makefile              | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 444d0f2ac..217254f1a 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -571,6 +571,10 @@
 	Fix position of marker symbols for SC_MARGIN_RTEXT which were being moved based on
 	width of text.
 	</li>
+	<li>
+	Allow cross-building for GTK by choosing pkg-config.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2189/">Bug #2189</a>.
+	</li>
     </ul>
     <h3>
        <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.21.0/scintilla3210.zip/download">Release 3.21.0</a>
diff --git a/gtk/makefile b/gtk/makefile
index 5dab941d4..1117a420c 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -39,6 +39,7 @@ BASE_FLAGS += -fsanitize=$(SANITIZE)
 endif
 ARFLAGS = rc
 RANLIB ?= ranlib
+PKG_CONFIG ?= pkg-config
 
 GTK_VERSION = $(if $(GTK3),gtk+-3.0,gtk+-2.0)
 
@@ -89,7 +90,7 @@ LUA_OBJS:=lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o linit.o \
 endif
 
 
-CONFIG_FLAGS:=$(shell pkg-config --cflags $(GTK_VERSION))
+CONFIG_FLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION))
 MARSHALLER=scintilla-marshal.o
 
 all: $(COMPLIB)
-- 
cgit v1.2.3