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 cba4d81f4dcf289f83056098b93c6029617d284b..1b56b1bd46ec23e611654727cb8c1a92ddb7e45e 100644 (file)
--- 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 339e5fc186a34552d650ccc44eda971906fb6d8f..384a65c646472da66aedfa7965f3bf6a19a3d020 100644 (file)
--- 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