fix kexec-tools build

[openwrt/svn-archive/archive.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index 51daa860444c3101379287bab352504c9f19b234..389ee5b6b0197da18f288fe585e862224e322b3b 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
 
-PKG_CONFIG_PATH:=.
 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 
 define Build/DefaultTargets
@@ -176,7 +175,7 @@ define BuildPackage
        echo "Version: $(VERSION)"; \
        echo "Depends: $$(IDEPEND_$(1))"; \
        echo "Provides: $(PROVIDES)"; \
-       echo "Build-Depends: $(PKG_BUILDDEP)"; \
+       echo "Build-Depends: $(PKG_BUILD_DEPENDS)"; \
        echo "Section: $(SECTION)"; \
        echo "Category: $(CATEGORY)"; \
        echo "Title: $(TITLE)"; \
@@ -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)
+       @rm -f $(PACKAGE_DIR)/$(1)_*
        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
 
-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_CONFIG_PATH)/configure \
+CONFIGURE_ARGS := \
                --target=$(GNU_TARGET_NAME) \
                --host=$(GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \
@@ -312,7 +301,28 @@ define Build/Configure/Default
                --localstatedir=/var \
                --mandir=/usr/man \
                --infodir=/usr/info \
-               $(DISABLE_NLS) \
+               $(DISABLE_NLS)
+
+TARGET_CPPFLAGS=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+TARGET_LDFLAGS=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
+CONFIGURE_VARS:= \
+               $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS)" \
+               CXXFLAGS="$(TARGET_CFLAGS)" \
+               CPPFLAGS="$(TARGET_CPPFLAGS)" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
+               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; \
        )
@@ -322,14 +332,20 @@ define Build/Configure
   $(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
-       CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) " \
-       LDFLAGS="$(EXTRA_LDFLAGS) " \
+       $(MAKE_VARS) \
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               CROSS="$(TARGET_CROSS)" \
-               CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) " \
-               ARCH="$(ARCH)" \
+               $(MAKE_FLAGS) \
                $(1);
 endef