From 23795ec71f546c4d89b911f67d539393d92059ce Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 17 Apr 2009 15:55:16 +0000 Subject: [PATCH] pkg-config: fix target package As reported by Sven Neumann on the list. --- package/Config.in | 2 +- package/{pkgconfig => pkg-config}/Config.in | 0 .../pkg-config-0.23-fix-sysroot.patch | 0 package/{pkgconfig/pkgconfig.mk => pkg-config/pkg-config.mk} | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename package/{pkgconfig => pkg-config}/Config.in (100%) rename package/{pkgconfig => pkg-config}/pkg-config-0.23-fix-sysroot.patch (100%) rename package/{pkgconfig/pkgconfig.mk => pkg-config/pkg-config.mk} (94%) diff --git a/package/Config.in b/package/Config.in index 004894bcd5..4189af009d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -43,7 +43,7 @@ source "package/libtool/Config.in" source "package/m4/Config.in" source "package/mpatrol/Config.in" source "package/oprofile/Config.in" -source "package/pkgconfig/Config.in" +source "package/pkg-config/Config.in" source "package/readline/Config.in" source "package/valgrind/Config.in" source "package/pcre/Config.in" diff --git a/package/pkgconfig/Config.in b/package/pkg-config/Config.in similarity index 100% rename from package/pkgconfig/Config.in rename to package/pkg-config/Config.in diff --git a/package/pkgconfig/pkg-config-0.23-fix-sysroot.patch b/package/pkg-config/pkg-config-0.23-fix-sysroot.patch similarity index 100% rename from package/pkgconfig/pkg-config-0.23-fix-sysroot.patch rename to package/pkg-config/pkg-config-0.23-fix-sysroot.patch diff --git a/package/pkgconfig/pkgconfig.mk b/package/pkg-config/pkg-config.mk similarity index 94% rename from package/pkgconfig/pkgconfig.mk rename to package/pkg-config/pkg-config.mk index 34df017613..5b88bf9225 100644 --- a/package/pkgconfig/pkgconfig.mk +++ b/package/pkg-config/pkg-config.mk @@ -15,7 +15,7 @@ PKG_CONFIG_DEPENDENCIES = uclibc libglib2 PKG_CONFIG_CONF_OPT = --with-installed-glib -$(eval $(call AUTOTARGETS,package,pkgconfig)) +$(eval $(call AUTOTARGETS,package,pkg-config)) # pkg-config for the host PKG_CONFIG_HOST_DIR:=$(BUILD_DIR)/pkg-config-$(PKG_CONFIG_VERSION)-host @@ -28,7 +28,7 @@ $(STAMP_DIR)/host_pkgconfig_unpacked: $(DL_DIR)/$(PKG_CONFIG_SOURCE) mkdir -p $(PKG_CONFIG_HOST_DIR) $(INFLATE$(suffix $(PKG_CONFIG_SOURCE))) $< | \ $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(PKG_CONFIG_HOST_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(PKG_CONFIG_HOST_DIR) package/pkgconfig/ \*.patch + toolchain/patch-kernel.sh $(PKG_CONFIG_HOST_DIR) package/pkg-config/ \*.patch touch $@ $(STAMP_DIR)/host_pkgconfig_configured: $(STAMP_DIR)/host_pkgconfig_unpacked -- 2.30.2