commit db3853da225d5e881b2c6d371aec7b4b5d61b322 parent 7a24f4d4bd10a54162c64d6a64aee326cf369270 Author: Vincent Forest <vincent.forest@meso-star.com> Date: Wed, 5 Jul 2023 11:45:48 +0200 No longer use the --with-path option of pkg-config This option is not available on all implementations of the pkg-config utility and can be easily overridden through the use of the PKG_CONFIG_PATH variable. Diffstat:
| M | Makefile | | | 8 | +++++--- |
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile @@ -157,11 +157,13 @@ TEST_SRC =\ TEST_OBJ = $(TEST_SRC:.c=.o) TEST_DEP = $(TEST_SRC:.c=.d) -S3D_CFLAGS = $$($(PKG_CONFIG) --with-path=./ $(PCFLAGS) --cflags s3d-local.pc) -S3D_LIBS = $$($(PKG_CONFIG) --with-path=./ $(PCFLAGS) --libs s3d-local.pc) +PKG_CONFIG_LOCAL = PKG_CONFIG_PATH="./:$${PKG_CONFIG_PATH}" $(PKG_CONFIG) +S3D_CFLAGS = $$($(PKG_CONFIG_LOCAL) $(PCFLAGS) --cflags s3d-local.pc) +S3D_LIBS = $$($(PKG_CONFIG) $(PCFLAGS) --libs s3d-local.pc) build_tests: build_library $(TEST_DEP) .test - @$(MAKE) -fMakefile -f.test $$(for i in $(TEST_DEP); do echo -f"$${i}"; done) test_bin + @$(MAKE) -fMakefile -f.test \ + $$(for i in $(TEST_DEP); do echo -f"$${i}"; done) test_bin test: build_tests @$(SHELL) make.sh run_test $(TEST_SRC)