add TARGET_CFLAGS to configure for userland lib and util.

[openwrt.git] / package / rules.mk

diff --git a/package/rules.mk b/package/rules.mk
index d44cd986a497487e0f4c426fe8bc8b040a2e7564..37dc2a0ac6f45c9d09401fe94dabfeb4b931d0b6 100644 (file)
--- 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" \
@@ -257,10 +258,6 @@ define Build/Compile
   $(call Build/Compile/Default,)
 endef
 
-define Build/Clean
-       $(MAKE) clean
-endef
-
 ifneq ($(DUMP),)
   dumpinfo: FORCE
        @$(DUMPINFO)
@@ -282,5 +279,6 @@ else
   clean-targets:
   clean: FORCE
        @$(MAKE) clean-targets
+       $(call Build/Clean)
        rm -rf $(PKG_BUILD_DIR)
 endif