bld_path=$(ver_$(1))/$(2)
if_pkg=$(if $(ver_$(1)),$(2),$(3))
if_npkg=$(if $(ver_$(1)),,$(2))
-if_shr=$(if $(findstring $(1),$(shared_pkgs)),$(2),$(3))
+if_shr=$(if $(filter $(1),$(shared_pkgs)),$(2),$(3))
pkg_conf=$(call if_shr,$(1),$(foreach p,$(pc_$(1)), $(shell pkg-config 2> /dev/null $(2) $(p))))
inc_path=$(call if_pkg,$(1),$(inc_$(1)), $(call pkg_conf,$(1),--cflags))
ld_path=$(call if_pkg,$(1),-L$(call bld_path,$(1),$(2)) $(lib_$(1)))
-if_ena=$(if $(or $(ver_$(1)),$(findstring $(1),$(shared_pkgs))),$(2))
-if_want=$(if $(findstring x$(WANT_$(1)),xyes),$(2),$(3))
+if_ena=$(if $(or $(ver_$(1)),$(filter $(1),$(shared_pkgs))),$(2))
+if_want=$(if $(filter x$(WANT_$(1)),xyes),$(2),$(3))
#$(eval $(call std-build,pkg,deps...))
#$(pkg.cflags) added as CFLAGS+=$(cflags) to pkg.vars