openvpn: clean up and fix the init script

[openwrt.git] / tools / pkg-config / Makefile

diff --git a/tools/pkg-config/Makefile b/tools/pkg-config/Makefile
index 0a68e74..6bd53f8 100644 (file)
--- a/tools/pkg-config/Makefile
+++ b/tools/pkg-config/Makefile
@@ -7,28 +7,30 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pkg-config
-PKG_VERSION:=0.22
+PKG_VERSION:=0.28
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://pkgconfig.freedesktop.org/releases/
-PKG_MD5SUM:=fd5c547e9d66ba49bc735ccb8c791f2a
+PKG_MD5SUM:=aa3c86e67551adc3ac865160e34a2a0d
+
+HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Host/Compile
-       $(MAKE) -C $(HOST_BUILD_DIR)
-endef
+HOST_LDFLAGS += $(HOST_STATIC_LINKING)
+unexport PKG_CONFIG
+
+HOST_CONFIGURE_ARGS += --with-internal-glib
 
 define Host/Install
-       $(MAKE) -C $(HOST_BUILD_DIR) \
-               install
+       $(MAKE) -C $(HOST_BUILD_DIR) install \
+               AM_LDFLAGS="$(if $(HOST_STATIC_LINKING),-all-static)"
        mv $(STAGING_DIR_HOST)/bin/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config.real
        $(INSTALL_BIN) ./files/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config
 endef
 
 define Host/Clean
-       $(MAKE) -C $(HOST_BUILD_DIR) uninstall
-       $(MAKE) -C $(HOST_BUILD_DIR) clean
+       -$(MAKE) -C $(HOST_BUILD_DIR) uninstall
        $(call Host/Clean/Default)
 endef