From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 16 Jun 2006 21:39:42 +0000 (+0000)
Subject: use rm -f in package-rebuild and add extra options to the default configure template
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5b244391701e4d2fc72a80d90ae98c3baf88ef6a;p=openwrt%2Fstaging%2Fblocktrron.git

use rm -f in package-rebuild and add extra options to the default configure template

SVN-Revision: 3965
---

diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk
index 77a6595e82..37dc2a0ac6 100644
--- a/openwrt/package/rules.mk
+++ b/openwrt/package/rules.mk
@@ -47,7 +47,7 @@ define Build/DefaultTargets
 	rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
 
   package-rebuild: FORCE
-	@-rm $(PKG_BUILD_DIR)/.built
+	@-rm -f $(PKG_BUILD_DIR)/.built
 
   define Build/DefaultTargets
   endef
@@ -211,8 +211,9 @@ define Build/Prepare
 endef
 
 define Build/Configure/Default
-	@(cd $(PKG_BUILD_DIR); \
+	@(cd $(PKG_BUILD_DIR)/$(3); \
 	[ -x configure ] && \
+		$(2) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \