enforce setting subtarget so gtk2 gets named the correct thing in installs

This commit is contained in:
Vincent Sanders 2019-12-03 17:45:16 +00:00
parent 3a8317fddb
commit 2cebe26058

View File

@ -303,10 +303,7 @@ else
else else
ifeq ($(TARGET),gtk2) ifeq ($(TARGET),gtk2)
override TARGET := gtk override TARGET := gtk
ifeq ($(origin NETSURF_GTK_MAJOR),undefined)
override NETSURF_GTK_MAJOR := 2 override NETSURF_GTK_MAJOR := 2
else
ifneq ($(NETSURF_GTK_MAJOR),2)
SUBTARGET = $(NETSURF_GTK_MAJOR) SUBTARGET = $(NETSURF_GTK_MAJOR)
endif endif
endif endif
@ -317,8 +314,6 @@ else
endif endif
endif endif
endif endif
endif
endif
# compiler versioning to adjust warning flags # compiler versioning to adjust warning flags
CC_VERSION := $(shell $(CC) -dumpfullversion -dumpversion) CC_VERSION := $(shell $(CC) -dumpfullversion -dumpversion)