From: Martin Mares <mj@ucw.cz>
Date: Wed, 25 Jun 2008 09:06:02 +0000 (+0200)
Subject: Build system hack: set PKG_CONFIG_PATH in shell commands.
X-Git-Tag: holmes-import~433
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=f39e60b28e01164d94d84340a3a68158d1b644bb;p=libucw.git

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).
---

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