only run trap error code in the configure template, if the configure script was not...

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

diff --git a/include/package.mk b/include/package.mk
index 311ec35..ce3c4b6 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -263,7 +263,7 @@ endef
 
 define Build/Configure/Default
        @(cd $(PKG_BUILD_DIR)/$(3); \
 
 define Build/Configure/Default
        @(cd $(PKG_BUILD_DIR)/$(3); \

-       [ -x configure ] && \
+       [ -x configure ] && { \

                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \


@@ -287,7 +287,7 @@ define Build/Configure/Default
                --infodir=/usr/info \
                $(DISABLE_NLS) \
                $(1); \
                --infodir=/usr/info \
                $(DISABLE_NLS) \
                $(1); \

-               true; \
+       } || true; \

        )
 endef
 
        )
 endef