fix alsa compile

[openwrt.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index 12e4190..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


@@ -213,6 +212,7 @@ define BuildPackage
   $(eval $(call BuildIPKGVariable,$(1),prerm))
   $(eval $(call BuildIPKGVariable,$(1),postrm))
   $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH)
   $(eval $(call BuildIPKGVariable,$(1),prerm))
   $(eval $(call BuildIPKGVariable,$(1),postrm))
   $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH)

+       @rm -f $(PACKAGE_DIR)/$(1)_*

        mkdir -p $$(IDIR_$(1))/CONTROL
        echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
        echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
        mkdir -p $$(IDIR_$(1))/CONTROL
        echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
        echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control


@@ -285,18 +285,7 @@ define Build/Prepare
   $(call Build/Prepare/Default,)
 endef
 
   $(call Build/Prepare/Default,)
 endef
 

-define Build/Configure/Default
-       (cd $(PKG_BUILD_DIR)/$(strip $(3)); \
-       if [ -x configure ]; then \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               CXXFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
-               PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \
-               $(2) \
-               $(PKG_CONFIGURE_PATH)/configure \
+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) \


@@ -312,7 +301,26 @@ define Build/Configure/Default
                --localstatedir=/var \
                --mandir=/usr/man \
                --infodir=/usr/info \
                --localstatedir=/var \
                --mandir=/usr/man \
                --infodir=/usr/info \

-               $(DISABLE_NLS) \
+               $(DISABLE_NLS)
+
+CONFIGURE_VARS:= \
+               $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS)" \
+               CXXFLAGS="$(TARGET_CFLAGS)" \
+               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               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) \
+               $(CONFIGURE_PATH)/configure \
+               $(CONFIGURE_ARGS) \

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


@@ -322,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