fix alsa compile

[openwrt.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index 0400d08..95508bc 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -14,7 +14,6 @@ include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 

-PKG_CONFIGURE_PATH:=.

 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 
 define Build/DefaultTargets
 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 
 define Build/DefaultTargets


@@ -313,12 +312,14 @@ 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:=.
+

 define Build/Configure/Default
        (cd $(PKG_BUILD_DIR)/$(strip $(3)); \
        if [ -x configure ]; then \
                $(CONFIGURE_VARS) \
                $(2) \
 define Build/Configure/Default
        (cd $(PKG_BUILD_DIR)/$(strip $(3)); \
        if [ -x configure ]; then \
                $(CONFIGURE_VARS) \
                $(2) \

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

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


@@ -329,14 +330,20 @@ define Build/Configure
   $(call Build/Configure/Default,)
 endef
 
   $(call Build/Configure/Default,)
 endef
 

+MAKE_VARS := \
+       CFLAGS="$(TARGET_CFLAGS)" \
+       CXXFLAGS="$(TARGET_CFLAGS) " \
+       LDFLAGS="$(EXTRA_LDFLAGS) "
+
+MAKE_FLAGS := \
+       $(TARGET_CONFIGURE_OPTS) \
+       CROSS="$(TARGET_CROSS)" \
+       ARCH="$(ARCH)"
+

 define Build/Compile/Default
 define Build/Compile/Default

-       CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) " \
-       LDFLAGS="$(EXTRA_LDFLAGS) " \
+       $(MAKE_VARS) \

        $(MAKE) -C $(PKG_BUILD_DIR) \
        $(MAKE) -C $(PKG_BUILD_DIR) \

-               $(TARGET_CONFIGURE_OPTS) \
-               CROSS="$(TARGET_CROSS)" \
-               CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) " \
-               ARCH="$(ARCH)" \
+               $(MAKE_FLAGS) \

                $(1);
 endef
 
                $(1);
 endef