From f39e60b28e01164d94d84340a3a68158d1b644bb Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Wed, 25 Jun 2008 11:06:02 +0200 Subject: [PATCH] Build system hack: set PKG_CONFIG_PATH in shell commands. Unfortunately, even if we `export PKG_CONFIG_PATH' explicitly in the makefiles, make still ignores it for $(shell). --- build/Makebottom | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Makebottom b/build/Makebottom index bf9a49e9..1a37a35b 100644 --- a/build/Makebottom +++ b/build/Makebottom @@ -123,7 +123,7 @@ $(o)/%-tt.o: $(s)/%.c $(o)/autoconf.h $(o)/%-t: $(o)/%-tt.o $(TESTING_DEPS) $(M)LD-TEST $@ - $(Q)$(CC) $(LDFLAGS) -o $@ $(shell $(s)/build/lib-flags $^) $(LIBS) + $(Q)$(CC) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(s)/build/lib-flags $^) $(LIBS) $(o)/%.test: $(s)/%.t $(s)/build/tester $(M)TEST $@ @@ -135,7 +135,7 @@ BINDIR=bin $(o)/%: $(o)/%.o $(M)LD $@ - $(Q)$(CC) $(LDFLAGS) -o $@ $(shell $(s)/build/lib-flags $^) $(LIBS) + $(Q)$(CC) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(s)/build/lib-flags $^) $(LIBS) $(Q)$(call symlink,$@,run/$(BINDIR)) $(o)/%: $(s)/%.sh $(o)/config.mk $(s)/build/genconf -- 2.39.2