From 6f7ab15526f1fef558212efc363a2023a5699e7d Mon Sep 17 00:00:00 2001 From: Neil Date: Sun, 29 Dec 2019 10:48:30 +1100 Subject: Backport: Use if function to simplify GTK version setting. Backport of changeset 7850:914269287f12. --- gtk/makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'gtk/makefile') diff --git a/gtk/makefile b/gtk/makefile index a050d21ce..b5437346e 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -26,11 +26,7 @@ endif ARFLAGS = rc RANLIB ?= ranlib -ifdef GTK3 -GTKVERSION=gtk+-3.0 -else -GTKVERSION=gtk+-2.0 -endif +GTK_VERSION = $(if $(GTK3),gtk+-3.0,gtk+-2.0) # Environment variable windir always defined on Win32 @@ -76,7 +72,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 $(GTKVERSION)) +CONFIG_FLAGS:=$(shell pkg-config --cflags $(GTK_VERSION)) MARSHALLER=scintilla-marshal.o all: $(COMPLIB) -- cgit v1.2.3