another madwifi update

[openwrt.git] / include / package-defaults.mk

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 3f3b33e..877fff8 100644 (file)
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -33,19 +33,18 @@ define Package/Default
   DESCRIPTION:=
 endef
 
   DESCRIPTION:=
 endef
 

+Build/Patch:=$(Build/Patch/Default)

 ifneq ($(strip $(PKG_UNPACK)),)
   define Build/Prepare/Default
        $(PKG_UNPACK)
 ifneq ($(strip $(PKG_UNPACK)),)
   define Build/Prepare/Default
        $(PKG_UNPACK)

-       @if [ -d ./patches -a "$$$$(ls ./patches | wc -l)" -gt 0 ]; then \
-               $(PATCH) $(PKG_BUILD_DIR) ./patches; \
-       fi
+       $(Build/Patch)

   endef
 endif
 
   endef
 endif
 

-TARGET_CPPFLAGS=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
-TARGET_LDFLAGS=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
+TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib

 
 

-CONFIGURE_ARGS := \
+CONFIGURE_ARGS = \

                --target=$(GNU_TARGET_NAME) \
                --host=$(GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \
                --target=$(GNU_TARGET_NAME) \
                --host=$(GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \


@@ -63,7 +62,7 @@ CONFIGURE_ARGS := \
                --infodir=/usr/info \
                $(DISABLE_NLS)
 
                --infodir=/usr/info \
                $(DISABLE_NLS)
 

-CONFIGURE_VARS:= \
+CONFIGURE_VARS = \

                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
                CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
                CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \


@@ -72,33 +71,37 @@ CONFIGURE_VARS:= \
                PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
                PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
 
                PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
                PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
 

-CONFIGURE_PATH:=.
+CONFIGURE_PATH = .
+CONFIGURE_CMD = ./configure

 
 define Build/Configure/Default
 
 define Build/Configure/Default

-       (cd $(PKG_BUILD_DIR)/$(strip $(3)); \
-       if [ -x configure ]; then \
+       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \
+       if [ -x $(CONFIGURE_CMD) ]; then \
+               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/$(3)/ && \

                $(CONFIGURE_VARS) \
                $(2) \
                $(CONFIGURE_VARS) \
                $(2) \

-               $(CONFIGURE_PATH)/configure \
+               $(CONFIGURE_CMD) \

                $(CONFIGURE_ARGS) \
                $(1); \
        fi; \
        )
 endef
 
                $(CONFIGURE_ARGS) \
                $(1); \
        fi; \
        )
 endef
 

-MAKE_VARS := \
+MAKE_VARS = \

        CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
        CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
        LDFLAGS="$(EXTRA_LDFLAGS) "
 
        CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
        CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
        LDFLAGS="$(EXTRA_LDFLAGS) "
 

-MAKE_FLAGS := \
+MAKE_FLAGS = \

        $(TARGET_CONFIGURE_OPTS) \
        CROSS="$(TARGET_CROSS)" \
        ARCH="$(ARCH)"
 
        $(TARGET_CONFIGURE_OPTS) \
        CROSS="$(TARGET_CROSS)" \
        ARCH="$(ARCH)"
 

+MAKE_PATH = .
+

 define Build/Compile/Default
        $(MAKE_VARS) \
 define Build/Compile/Default
        $(MAKE_VARS) \

-       $(MAKE) -C $(PKG_BUILD_DIR) \
+       $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \

                $(MAKE_FLAGS) \
                $(1);
 endef
                $(MAKE_FLAGS) \
                $(1);
 endef