From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
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.ozo.com/?a=commitdiff_plain;ds=sidebyside;h=2311031bc3ad669b1d01d11e5b1cbccd74a66fe8;hp=373ee92409d6c916c4ee5d77b895882fd3a5bd2c;p=openwrt-10.03%2F.git

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

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3965 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/rules.mk b/package/rules.mk
index 77a6595e8..37dc2a0ac 100644
--- a/package/rules.mk
+++ b/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" \