diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-10-26 09:14:06 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-10-26 09:14:06 +0000 |
| commit | ac71691272a0ea9902a200a4e60d0e3658f5f6b9 (patch) | |
| tree | 10a21cefd6fb9f90643e247b3577c6dc54f94c7e | |
| parent | 7543f7dff4c765497ec5388d62cba7f5b4d678e2 (diff) | |
docker: s/PKGCONFIG/PKG_CONFIG/ to be consistent
Patch by Markus Heidelberg.
| -rw-r--r-- | package/docker/docker-1.5-pkgconfig.patch | 4 | ||||
| -rw-r--r-- | package/docker/docker.mk | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/package/docker/docker-1.5-pkgconfig.patch b/package/docker/docker-1.5-pkgconfig.patch index cba4d81f4..1b56b1bd4 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 339e5fc18..384a65c64 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 |