X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2FMakefile;h=25d654e48a6274bbf40e9570919306e32e4e1518;hb=f068b73c1d4afafbf6d86e7f5bc8f1c96b5366d3;hp=846a843fca468e0eeb2a63ecf14bca02a0c68978;hpb=33aae273918725085d841a8af927bfccd2aa9364;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 846a843f..25d654e4 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -55,12 +55,12 @@ bld_depends=$(if $(ver_$(1)),$(call pkg-built,$(1))) 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