X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/86b833a6c9272bc0a708a7f98020d42fd2951720..3e032c51feb1678d9fe2ff1c5570135f3da40da4:/include/package.mk?ds=sidebyside

diff --git a/include/package.mk b/include/package.mk
index 7f29e5f9c..84575169b 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -14,7 +14,7 @@ include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 
-PKG_CONFIG_PATH:=.
+PKG_CONFIGURE_PATH:=.
 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 
 define Build/DefaultTargets
@@ -213,6 +213,7 @@ define BuildPackage
   $(eval $(call BuildIPKGVariable,$(1),prerm))
   $(eval $(call BuildIPKGVariable,$(1),postrm))
   $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH)
+	@rm -f $(PACKAGE_DIR)/$(1)_*
 	mkdir -p $$(IDIR_$(1))/CONTROL
 	echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
 	echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
@@ -296,7 +297,7 @@ define Build/Configure/Default
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
 		PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \
 		$(2) \
-		$(PKG_CONFIG_PATH)/configure \
+		$(PKG_CONFIGURE_PATH)/configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \