From 877f4da8b81623bbdd683439f5076594c511dbf4 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 14 Mar 2018 02:29:44 +1100 Subject: pkgconf: new-style options --- src/pkgconf.mk | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/pkgconf.mk b/src/pkgconf.mk index 8e4b7f2..ec7b142 100644 --- a/src/pkgconf.mk +++ b/src/pkgconf.mk @@ -5,15 +5,11 @@ $(PKG)_WEBSITE := https://github.com/pkgconf/pkgconf $(PKG)_IGNORE := $(PKG)_VERSION := da179fd $(PKG)_CHECKSUM := 91b2e5d7ce06583d5920c373b61d7d6554cd085cbd61ed176c7ff7ff3032523d -$(PKG)_SUBDIR := $(PKG)-$(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/$(PKG)/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_GH_CONF := pkgconf/pkgconf/branches/master $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) $(PKG)_DEPS := $(BUILD)~$(PKG) $(PKG)_DEPS_$(BUILD) := libtool -$(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, pkgconf/pkgconf, master) - define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package pkgconf.' >&2; echo $(pkgconf_VERSION) @@ -39,9 +35,9 @@ define $(PKG)_BUILD endef define $(PKG)_BUILD_$(BUILD) - cd '$(1)' && ./autogen.sh - cd '$(1)' && ./configure \ + cd '$(SOURCE_DIR)' && ./autogen.sh + cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \ --prefix='$(PREFIX)/$(TARGET)' - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install endef -- cgit v0.12