From f322a48302ae02faffa002c1ea4f335752e48a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Tue, 12 Dec 2023 16:37:50 +0100 Subject: [PATCH] PKG_CONFIG is the canonical spelling acc'g to http://crossqa.debian.net/build/urlview_1b-1_arm64_20231205033603.log --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d910be6..1056a52 100644 --- a/Makefile +++ b/Makefile @@ -12,14 +12,14 @@ TZPFMS_DATE ?= AWK ?= awk SED ?= sed MANDOC ?= mandoc -PKGCONF ?= pkgconf +PKG_CONFIG ?= pkgconf SHELLCHECK ?= shellcheck NOLOCREGEN ?= OUTDIR := out/ BLDDIR := out/build/ -SYSTEMD_SYSTEM_UNITDIR := $(shell $(PKGCONF) --variable=systemd_system_unit_dir systemd 2>/dev/null || echo /usr/lib/systemd/system) +SYSTEMD_SYSTEM_UNITDIR := $(shell $(PKG_CONFIG) --variable=systemd_system_unit_dir systemd 2>/dev/null || echo /usr/lib/systemd/system) ifneq "$(TZPFMS_DATE)" "" MANUAL_DATE := $(TZPFMS_DATE) else ifneq "$(SOURCE_DATE_EPOCH)" "" @@ -30,12 +30,12 @@ endif PKGS := libzfs libzfs_core tss2-esys tss2-rc -PKGCONF_LIBS := $(shell pkg-config --libs $(PKGS)) -PKGCONF_CFLAGS := $(shell pkg-config --cflags $(PKGS)) +PKG_CONFIG_LIBS := $(shell $(PKG_CONFIG) --libs $(PKGS)) +PKG_CONFIG_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(PKGS)) LDFLAGS += -Wl,--as-needed -LDLIBS += -lrt -ltspi -lcrypto $(PKGCONF_LIBS) -CXXFLAGS += -g -O3 -std=c++17 -fno-exceptions -fno-rtti -Wall -Wextra -pipe -fPIC $(PKGCONF_CFLAGS) +LDLIBS += -lrt -ltspi -lcrypto $(PKG_CONFIG_LIBS) +CXXFLAGS += -g -O3 -std=c++17 -fno-exceptions -fno-rtti -Wall -Wextra -pipe -fPIC $(PKG_CONFIG_CFLAGS) CPPFLAGS += -MD -DTZPFMS_VERSION='$(TZPFMS_VERSION)' BINARY_SOURCES := $(sort $(wildcard src/bin/*.cpp src/bin/**/*.cpp)) COMMON_SOURCES := $(filter-out $(BINARY_SOURCES),$(sort $(wildcard src/*.cpp src/**/*.cpp src/**/**/*.cpp src/**/**/**/*.cpp)))