| From 0cd38e6dbcaff7eef39fd46a60ff8a47e5f488c4 Mon Sep 17 00:00:00 2001 |
| From: Alexander Kanavin <alex@linutronix.de> |
| Date: Sun, 3 Oct 2021 23:08:48 +0200 |
| Subject: [PATCH] config.ml: make compatible with webkitgtk 2.34.0 |
| |
| Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| --- |
| config.mk | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/config.mk |
| +++ b/config.mk |
| @@ -2,6 +2,7 @@ |
| VERSION = 2.1 |
| |
| # Customize below to fit your system |
| +PKG_CONFIG ?= pkg-config |
| |
| # paths |
| PREFIX = /usr/local |
| @@ -9,13 +10,13 @@ MANPREFIX = $(PREFIX)/share/man |
| LIBPREFIX = $(PREFIX)/lib |
| LIBDIR = $(LIBPREFIX)/surf |
| |
| -X11INC = `pkg-config --cflags x11` |
| -X11LIB = `pkg-config --libs x11` |
| +X11INC = $(shell $(PKG_CONFIG) --cflags x11) |
| +X11LIB = $(shell $(PKG_CONFIG) --libs x11) |
| |
| -GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0` |
| -GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0` |
| -WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` |
| -WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` |
| +GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1) |
| +GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.1) |
| +WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0) |
| +WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0) |
| |
| # includes and libs |
| INCS = $(X11INC) $(GTKINC) |