diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-19 08:30:20 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-19 08:30:20 +0000 |
| commit | 849c45648d2c84a2c98a6e22bd504a92e6751b96 (patch) | |
| tree | 30c66835c992b10d3319d2263ee180a68908470c /package/pkgconfig | |
| parent | 27fb8ed49d7b40f1f3a9c31a8895a944aae8beba (diff) | |
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.
Diffstat (limited to 'package/pkgconfig')
| -rw-r--r-- | package/pkgconfig/Config.in | 2 | ||||
| -rw-r--r-- | package/pkgconfig/pkgconfig.mk | 38 |
2 files changed, 20 insertions, 20 deletions
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) |