pkg-config: rename pkgconfig to pkg-config

This matches upstream tarball, doesn't screw up existing .config's with
BR2_PACKAGE_PKGCONFIG and makes sure the patch gets applied for target
compilation.

8 files changed, 27 insertions, 27 deletions

diff --git a/package/Makefile.in b/package/Makefile.in
index f5b8c216f..38f028742 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -251,7 +251,7 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		DEFAULT_ASSEMBLER="$(TARGET_AS)" \
 		DEFAULT_LINKER="$(TARGET_LD)" \
 		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
-		PKG_CONFIG="$(PKGCONFIG_HOST_BINARY)" \
+		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
 		STAGING_DIR="$(STAGING_DIR)"
 
@@ -296,7 +296,7 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
 		ORIGINAL_LD_FOR_TARGET="$(TARGET_LD)" \
 		ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \
 		ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \
-		PKG_CONFIG="$(PKGCONFIG_HOST_BINARY)" \
+		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_PATH="$(HOST_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)"
 
 HOST_MAKE_ENV=PATH=$(HOST_PATH)
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 4751f7614..c9e373e28 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -67,7 +67,7 @@ $(ATK_HOST_DIR)/.unpacked: $(DL_DIR)/$(ATK_SOURCE)
 		$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
 	touch $@
 
-$(ATK_HOST_DIR)/.configured: $(ATK_HOST_DIR)/.unpacked $(LIBGLIB2_HOST_BINARY) $(PKGCONFIG_HOST_BINARY)
+$(ATK_HOST_DIR)/.configured: $(ATK_HOST_DIR)/.unpacked $(LIBGLIB2_HOST_BINARY) $(PKG_CONFIG_HOST_BINARY)
 	(cd $(@D); rm -rf config.cache; \
 		$(HOST_CONFIGURE_OPTS) \
 		CFLAGS="$(HOST_CFLAGS)" \
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 4853b3834..c2fb35d66 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -94,7 +94,7 @@ $(CAIRO_HOST_DIR)/.unpacked: $(DL_DIR)/$(CAIRO_SOURCE)
 		$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
 	touch $@
 
-$(CAIRO_HOST_DIR)/.configured: $(CAIRO_HOST_DIR)/.unpacked $(PKGCONFIG_HOST_BINARY) $(FONTCONFIG_HOST_BINARY) $(PIXMAN_HOST_BINARY)
+$(CAIRO_HOST_DIR)/.configured: $(CAIRO_HOST_DIR)/.unpacked $(PKG_CONFIG_HOST_BINARY) $(FONTCONFIG_HOST_BINARY) $(PIXMAN_HOST_BINARY)
 	(cd $(@D); rm -rf config.cache; \
 		$(HOST_CONFIGURE_OPTS) \
 		CFLAGS="$(HOST_CFLAGS)" \
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 940510f86..608787619 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -33,7 +33,7 @@ $(FREETYPE_HOST_DIR)/.unpacked: $(DL_DIR)/$(FREETYPE_SOURCE)
 		$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
 	touch $@
 
-$(FREETYPE_HOST_DIR)/.configured: $(FREETYPE_HOST_DIR)/.unpacked $(PKGCONFIG_HOST_BINARY)
+$(FREETYPE_HOST_DIR)/.configured: $(FREETYPE_HOST_DIR)/.unpacked $(PKG_CONFIG_HOST_BINARY)
 	(cd $(@D); rm -rf config.cache; \
 		$(HOST_CONFIGURE_OPTS) \
 		CFLAGS="$(HOST_CFLAGS)" \
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 10d1704f3..b656c8557 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -142,7 +142,7 @@ $(LIBGTK2_HOST_DIR)/.unpacked: $(DL_DIR)/$(LIBGTK2_SOURCE)
 		$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
 	touch $@
 
-$(LIBGTK2_HOST_DIR)/.configured: $(LIBGTK2_HOST_DIR)/.unpacked $(PKGCONFIG_HOST_BINARY) $(CAIRO_HOST_BINARY) $(LIBGLIB2_HOST_BINARY) $(PANGO_HOST_BINARY) $(ATK_HOST_BINARY)
+$(LIBGTK2_HOST_DIR)/.configured: $(LIBGTK2_HOST_DIR)/.unpacked $(PKG_CONFIG_HOST_BINARY) $(CAIRO_HOST_BINARY) $(LIBGLIB2_HOST_BINARY) $(PANGO_HOST_BINARY) $(ATK_HOST_BINARY)
 	(cd $(@D); rm -rf config.cache; \
 		$(HOST_CONFIGURE_OPTS) \
 		CFLAGS="$(HOST_CFLAGS)" \
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index bfad81a2d..2db730e49 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -73,7 +73,7 @@ $(PANGO_HOST_DIR)/.unpacked: $(DL_DIR)/$(PANGO_SOURCE)
 	toolchain/patch-kernel.sh $(@D) package/pango/ \*.patch
 	touch $@
 
-$(PANGO_HOST_DIR)/.configured: $(PANGO_HOST_DIR)/.unpacked $(PKGCONFIG_HOST_BINARY) $(CAIRO_HOST_BINARY) $(LIBGLIB2_HOST_BINARY)
+$(PANGO_HOST_DIR)/.configured: $(PANGO_HOST_DIR)/.unpacked $(PKG_CONFIG_HOST_BINARY) $(CAIRO_HOST_BINARY) $(LIBGLIB2_HOST_BINARY)
 	(cd $(@D); rm -rf config.cache; \
 		$(HOST_CONFIGURE_OPTS) \
 		CFLAGS="$(HOST_CFLAGS)" \
diff --git a/package/pkgconfig/Config.in b/package/pkgconfig/Config.in
index cd2852df6..8ec805527 100644
--- a/package/pkgconfig/Config.in
+++ b/package/pkgconfig/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_PKGCONFIG
+config BR2_PACKAGE_PKG_CONFIG
 	bool "pkg-config"
 	select BR2_PACKAGE_LIBGLIB2
 	help
diff --git a/package/pkgconfig/pkgconfig.mk b/package/pkgconfig/pkgconfig.mk
index dc6f11be5..6c89952c5 100644
--- a/package/pkgconfig/pkgconfig.mk
+++ b/package/pkgconfig/pkgconfig.mk
@@ -3,32 +3,32 @@
 # pkgconfig
 #
 #############################################################
-PKGCONFIG_VERSION = 0.23
-PKGCONFIG_SOURCE = pkg-config-$(PKGCONFIG_VERSION).tar.gz
-PKGCONFIG_SITE = http://pkgconfig.freedesktop.org/releases/
+PKG_CONFIG_VERSION = 0.23
+PKG_CONFIG_SOURCE = pkg-config-$(PKG_CONFIG_VERSION).tar.gz
+PKG_CONFIG_SITE = http://pkgconfig.freedesktop.org/releases/
 
 ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff
-PKGCONFIG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec
+PKG_CONFIG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec
 endif
 
-PKGCONFIG_DEPENDENCIES = uclibc libglib2
+PKG_CONFIG_DEPENDENCIES = uclibc libglib2
 
-PKGCONFIG_CONF_OPT = --with-installed-glib
+PKG_CONFIG_CONF_OPT = --with-installed-glib
 
 $(eval $(call AUTOTARGETS,package,pkgconfig))
 
-# pkgconfig for the host
-PKGCONFIG_HOST_DIR:=$(BUILD_DIR)/pkgconfig-$(PKGCONFIG_VERSION)-host
-PKGCONFIG_HOST_BINARY:=$(HOST_DIR)/usr/bin/pkg-config
+# pkg-config for the host
+PKG_CONFIG_HOST_DIR:=$(BUILD_DIR)/pkg-config-$(PKG_CONFIG_VERSION)-host
+PKG_CONFIG_HOST_BINARY:=$(HOST_DIR)/usr/bin/pkg-config
 
-$(PKGCONFIG_HOST_DIR)/.unpacked: $(DL_DIR)/$(PKGCONFIG_SOURCE)
+$(PKG_CONFIG_HOST_DIR)/.unpacked: $(DL_DIR)/$(PKG_CONFIG_SOURCE)
 	mkdir -p $(@D)
-	$(INFLATE$(suffix $(PKGCONFIG_SOURCE))) $< | \
+	$(INFLATE$(suffix $(PKG_CONFIG_SOURCE))) $< | \
 		$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(@D) package/pkgconfig/ \*.patch
 	touch $@
 
-$(PKGCONFIG_HOST_DIR)/.configured: $(PKGCONFIG_HOST_DIR)/.unpacked
+$(PKG_CONFIG_HOST_DIR)/.configured: $(PKG_CONFIG_HOST_DIR)/.unpacked
 	(cd $(@D); rm -rf config.cache; \
 		./configure \
 		--prefix=$(HOST_DIR)/usr \
@@ -38,19 +38,19 @@ $(PKGCONFIG_HOST_DIR)/.configured: $(PKGCONFIG_HOST_DIR)/.unpacked
 	)
 	touch $@
 
-$(PKGCONFIG_HOST_DIR)/.compiled: $(PKGCONFIG_HOST_DIR)/.configured
+$(PKG_CONFIG_HOST_DIR)/.compiled: $(PKG_CONFIG_HOST_DIR)/.configured
 	$(MAKE) -C $(@D)
 	touch $@
 
-$(PKGCONFIG_HOST_BINARY): $(PKGCONFIG_HOST_DIR)/.compiled
+$(PKG_CONFIG_HOST_BINARY): $(PKG_CONFIG_HOST_DIR)/.compiled
 	$(MAKE) -C $(<D) install
 
-host-pkgconfig: $(PKGCONFIG_HOST_BINARY)
+host-pkgconfig: $(PKG_CONFIG_HOST_BINARY)
 
 host-pkgconfig-clean:
-	rm -f $(addprefix $(PKGCONFIG_HOST_DIR)/,.unpacked .configured .compiled)
-	-$(MAKE) -C $(PKGCONFIG_HOST_DIR) uninstall
-	-$(MAKE) -C $(PKGCONFIG_HOST_DIR) clean
+	rm -f $(addprefix $(PKG_CONFIG_HOST_DIR)/,.unpacked .configured .compiled)
+	-$(MAKE) -C $(PKG_CONFIG_HOST_DIR) uninstall
+	-$(MAKE) -C $(PKG_CONFIG_HOST_DIR) clean
 
 host-pkgconfig-dirclean:
-	rm -rf $(PKGCONFIG_HOST_DIR)
+	rm -rf $(PKG_CONFIG_HOST_DIR)