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 77a6595e82f4ba7fcca70375808d589f8e4c94e8..37dc2a0ac6f45c9d09401fe94dabfeb4b931d0b6 100644 (file)
--- 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" \