From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 26 Oct 2008 09:14:06 +0000 (-0000)
Subject: docker: s/PKGCONFIG/PKG_CONFIG/ to be consistent
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ac71691272a0ea9902a200a4e60d0e3658f5f6b9;p=buildroot.git

docker: s/PKGCONFIG/PKG_CONFIG/ to be consistent

Patch by Markus Heidelberg.
---

diff --git a/package/docker/docker-1.5-pkgconfig.patch b/package/docker/docker-1.5-pkgconfig.patch
index cba4d81f4d..1b56b1bd46 100644
--- a/package/docker/docker-1.5-pkgconfig.patch
+++ b/package/docker/docker-1.5-pkgconfig.patch
@@ -13,11 +13,11 @@
  $(target): $(sources:.c=.o)
  	$(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
 -		`pkg-config --libs glib-2.0` $^ -o $@
-+		`$(PKGCONFIG) --libs glib-2.0` $^ -o $@
++		`$(PKG_CONFIG) --libs glib-2.0` $^ -o $@
  
  %.o: %.c
 -	$(CC) -c $(CFLAGS) `pkg-config --cflags glib-2.0` $<
-+	$(CC) -c $(CFLAGS) `$(PKGCONFIG) --cflags glib-2.0` $<
++	$(CC) -c $(CFLAGS) `$(PKG_CONFIG) --cflags glib-2.0` $<
  
  version.h: version.h.in Makefile
  	sed -e "s/@VERSION@/$(VERSION)/" version.h.in > $@
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 339e5fc186..384a65c646 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -14,6 +14,7 @@ DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
 					CFLAGS="-I$(STAGING_DIR)/usr/include \
 						-I$(STAGING_DIR)/usr/include/glib-2.0 \
 						-I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
+					PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
 					LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
 
 DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install