X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ddbaed92a0bf23a8c6d455a2d3d8d19c4d232cfe..5e8368aba49d428e6b733dea0fb8db925c5a3d9b:/include/package.mk

diff --git a/include/package.mk b/include/package.mk
index 87e76be2b..bada11f13 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -14,6 +14,8 @@ include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 
+export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
+
 define shvar
 V_$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
 endef
@@ -78,6 +80,7 @@ define Package/Default
   SECTION:=opt
   CATEGORY:=Extra packages
   DEPENDS:=
+  PROVIDES:=
   EXTRA_DEPENDS:=
   MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>
   SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd})
@@ -177,6 +180,7 @@ define BuildPackage
 	if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi; \
 	echo "Version: $(VERSION)"; \
 	echo "Depends: $$(IDEPEND_$(1))"; \
+	echo "Provides: $(PROVIDES)"; \
 	echo "Build-Depends: $(PKG_BUILDDEP)"; \
 	echo "Category: $(CATEGORY)"; \
 	echo "Title: $(TITLE)"; \
@@ -249,21 +253,23 @@ define BuildPackage
   clean: $(1)-clean
 
   $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(PKG_BUILD_DIR)/.prepared
-	-@rm $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null
+	-@rm -f $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null
 	@touch $$@
 
   $$(eval $$(call Build/DefaultTargets,$(1)))
 
-  ifneq ($$(CONFIG_PACKAGE_$(1)),)
-    ifneq ($(MAKECMDGOALS),prereq)
-      ifneq ($(DUMP),1)
-        ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install '$$(IPKG_$(1))' '$(PKG_BUILD_DIR)'),$$(IPKG_$(1)))
-          _INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1)))
-          $(PKG_BUILD_DIR)/.built: package-rebuild
-        endif
-
-        ifneq ($$(_INFO),)
-          $$(info Rebuilding $$(_INFO))
+  ifdef Package/$(1)/install
+    ifneq ($$(CONFIG_PACKAGE_$(1)),)
+      ifneq ($(MAKECMDGOALS),prereq)
+        ifneq ($(DUMP),1)
+          ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install '$$(IPKG_$(1))' '$(PKG_BUILD_DIR)'),$$(IPKG_$(1)))
+            _INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1)))
+            $(PKG_BUILD_DIR)/.built: package-rebuild
+          endif
+
+          ifneq ($$(_INFO),)
+            $$(info Rebuilding $$(_INFO))
+          endif
         endif
       endif
     endif
@@ -283,8 +289,22 @@ define Build/Prepare
   $(call Build/Prepare/Default,)
 endef
 
+define Build/Configure/Touch
+	(cd $(PKG_BUILD_DIR) ; \
+		touch configure.in ; \
+		touch aclocal.m4 ; \
+		touch Makefile.in ; \
+		touch configure ; \
+		touch acinclude.m4 ; \
+		touch config.h.in ; \
+		touch configure.ac ; \
+		touch stamp-h.in ; \
+        );
+endef
+
 define Build/Configure/Default
-	(cd $(PKG_BUILD_DIR)/$(3); \
+	$(call Build/Configure/Touch)
+	(cd $(PKG_BUILD_DIR)/$(strip $(3)); \
 	if [ -x configure ]; then \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
@@ -340,7 +360,7 @@ else
   $(PACKAGE_DIR):
 	mkdir -p $@
 		
-  ifneq ($(strip $(PKG_SOURCE)),)
+  ifneq ($(strip $(PKG_SOURCE_URL)),)
     download: $(DL_DIR)/$(PKG_SOURCE)
 
     $(DL_DIR)/$(PKG_SOURCE):