Skip to contentSkip to conversation

docker: s/PKGCONFIG/PKG_CONFIG/ to be consistent

PATCH New Markus Heidelberg 2 participants 2 messages Oct 24, 2008 – Oct 26, 2008

lore
Share & tools
lore

Markus Heidelberg

author
#0 lore raw

PATCH 1/1 docker: s/PKGCONFIG/PKG_CONFIG/ to be consistent

---
 package/docker/docker-1.5-pkgconfig.patch |    4 ++--
 package/docker/docker.mk                  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/docker/docker-1.5-pkgconfig.patch +2 -2
index cba4d81..1b56b1b 100644
@@ -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 > $@
package/docker/docker.mk +1 -1
index 78137cc..1e41ea9 100644
@@ -15,7 +15,7 @@ DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
 						-I$(STAGING_DIR)/usr/include/glib-2.0 \
 						-I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
 					LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-					PKGCONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
+					PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
 					PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
 					PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
Signature · 1 line
1.5.6.4
#1 lore raw

PATCH 1/1 docker: s/PKGCONFIG/PKG_CONFIG/ to be consistent

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Markus" == Markus Heidelberg <[email protected]> writes:

Markus> ---

 Markus>  package/docker/docker-1.5-pkgconfig.patch |    4 ++--
 Markus>  package/docker/docker.mk                  |    2 +-

Markus> 2 files changed, 3 insertions(+), 3 deletions(-)

Thanks, committed.

Signature · 1 line
Bye, Peter Korsgaard