build-src.mk, cmd.mk: Use pkgconf(1) instead of pkg-config(1)

Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/lib/build-src.mk b/lib/build-src.mk
index b6ec587b113c69ef0684c612d6d7c6a4e95613d2..2f0db0aa53da37040a686fadf76486ea25a6ba1b 100644 (file)
--- a/lib/build-src.mk
+++ b/lib/build-src.mk
@@ -15,10 +15,10 @@ include $(srcdir)/lib/src.mk
 include $(srcdir)/lib/verbose.mk
 
 
-PKG-CONFIG_LIBS := libbsd-overlay
+PKGCONF_LIBS := libbsd-overlay
 
 
-DEFAULT_CPPFLAGS := $(shell $(PKG-CONFIG) --cflags $(PKG-CONFIG_LIBS) $(HIDE_ERR))
+DEFAULT_CPPFLAGS := $(shell $(PKGCONF) --cflags $(PKGCONF_LIBS) $(HIDE_ERR))
 EXTRA_CPPFLAGS   :=
 CPPFLAGS         := $(DEFAULT_CPPFLAGS) $(EXTRA_CPPFLAGS)
 
@@ -40,13 +40,13 @@ DEFAULT_LDFLAGS := -Wl,--as-needed
 DEFAULT_LDFLAGS += -Wl,--no-allow-shlib-undefined
 DEFAULT_LDFLAGS += -Wl,--no-copy-dt-needed-entries
 DEFAULT_LDFLAGS += -Wl,--no-undefined
-DEFAULT_LDFLAGS += $(shell $(PKG-CONFIG) --libs-only-L $(PKG-CONFIG_LIBS) $(HIDE_ERR))
-DEFAULT_LDFLAGS += $(shell $(PKG-CONFIG) --libs-only-other $(PKG-CONFIG_LIBS) $(HIDE_ERR))
+DEFAULT_LDFLAGS += $(shell $(PKGCONF) --libs-only-L $(PKGCONF_LIBS) $(HIDE_ERR))
+DEFAULT_LDFLAGS += $(shell $(PKGCONF) --libs-only-other $(PKGCONF_LIBS) $(HIDE_ERR))
 EXTRA_LDFLAGS   :=
 LDFLAGS         := $(DEFAULT_LDFLAGS) $(EXTRA_LDFLAGS)
 
 DEFAULT_LDLIBS := -lc
-DEFAULT_LDLIBS += $(shell $(PKG-CONFIG) --libs-only-l $(PKG-CONFIG_LIBS) $(HIDE_ERR))
+DEFAULT_LDLIBS += $(shell $(PKGCONF) --libs-only-l $(PKGCONF_LIBS) $(HIDE_ERR))
 EXTRA_LDLIBS   :=
 LDLIBS         := $(DEFAULT_LDLIBS) $(EXTRA_LDLIBS)
 

diff --git a/lib/cmd.mk b/lib/cmd.mk
index fd03d4c306147c089cb6f4b534931aeb491250e4..efef045bfe326ebaf73c77981739108ebc8fcfa5 100644 (file)
--- a/lib/cmd.mk
+++ b/lib/cmd.mk
@@ -18,7 +18,7 @@ HEAD       := head
 INSTALL    := install
 LN         := ln
 LOCALE     := locale
-PKG-CONFIG := pkg-config
+PKGCONF    := pkgconf
 SED        := sed
 SORT       := sort
 SPONGE     := sponge