--- a/Makefile 2022-05-22 11:25:51.733047395 -0500 +++ b/Makefile 2022-05-22 11:42:54.240102003 -0500 @@ -186,7 +186,7 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') -HOST := $(shell sh -c 'cc -dumpmachine || echo unknown') +HOST := ARCH := $(HOST) ifdef CROSSHOST @@ -451,15 +451,7 @@ GCC_VER_SUFFIX:=-$(GCC_VER) endif -# Attempt to use a full compiler name, to make -# distcc builds work nicely. -LMACH := $(shell gcc -dumpmachine)- -ifeq ($(LMACH),-) LMACH := -endif -ifeq ($(shell which $(LMACH)gcc$(GCC_VER_SUFFIX) > /dev/null 2> /dev/null && echo "Yes"),) -LMACH := -endif ifneq ($(FORCE_CC),) GCC := $(FORCE_CC) @@ -759,7 +751,6 @@ FULLDEBUG=YesPlease DEBUG=YesPlease NO_OPTIMIZE=YesPlease - COVERAGE=YesPlease endif # Debug-Lite @@ -767,7 +758,6 @@ ifneq (,$(filter debug-lite,$(MAKECMDGOALS))) DEBUG=YesPlease NO_OPTIMIZE=YesPlease - COVERAGE=YesPlease endif # Profile @@ -775,12 +765,10 @@ ifneq (,$(filter profile,$(MAKECMDGOALS))) FULLDEBUG=YesPlease DEBUG=YesPlease - COVERAGE=YesPlease endif # Unit tests ifneq (,$(filter catch2-tests,$(MAKECMDGOALS))) - COVERAGE=YesPlease endif ifdef HURRY @@ -932,7 +920,7 @@ INSTALL_FONTS += "$(PROPORTIONAL_FONT)" endif else - SYS_PROPORTIONAL_FONT = $(shell util/find_font "$(OUR_PROPORTIONAL_FONT)") + SYS_PROPORTIONAL_FONT = /usr/share/fonts/dejavu/DejaVuSans.ttf ifneq (,$(SYS_PROPORTIONAL_FONT)) ifeq (,$(COPY_FONTS)) DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\" @@ -952,7 +940,7 @@ INSTALL_FONTS += "$(MONOSPACED_FONT)" endif else - SYS_MONOSPACED_FONT = $(shell util/find_font "$(OUR_MONOSPACED_FONT)") + SYS_MONOSPACED_FONT = /usr/share/fonts/dejavu/DejaVuSansMono.ttf ifneq (,$(SYS_MONOSPACED_FONT)) ifeq (,$(COPY_FONTS)) DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\" @@ -1092,14 +1080,8 @@ ifdef TILES_ANY ifndef NO_OPTIMIZE - ifneq (,$(shell which advpng)) - USE_ADVPNG = y - else - ifneq (,$(shell which pngcrush)) PNGCRUSH = pngcrush -q -m 113 PNGCRUSH_LABEL = PNGCRUSH - endif - endif endif endif @@ -1181,9 +1163,8 @@ LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??))) SRC_PKG_BASE := stone_soup -SRC_VERSION := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver) +SRC_VERSION := $(shell cat util/release_ver) MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/') -RECENT_TAG := $(shell git describe --abbrev=0 --tags $(MERGE_BASE)) WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo win32) export SRC_VERSION @@ -1511,7 +1492,7 @@ endif endif -install: all install-data +install: install-data [ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix) $(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/ $(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME) @@ -1747,9 +1728,6 @@ dat/tiles/%.png: $(RLTILES)/%.png $(QUIET_PNGCRUSH)$(PNGCRUSH) $< $@ -ifdef USE_ADVPNG - $(QUIET_ADVPNG)$(ADVPNG) $@ -endif clean-rltiles: $(RM) $(DESTTILEFILES)