fix kexec-tools build

SVN-Revision: 6428

diff --git a/include/package.mk b/include/package.mk
index 95508bc5d8dcd9f3f3bce66dce57077b775ec36b..389ee5b6b0197da18f288fe585e862224e322b3b 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -303,12 +303,14 @@ CONFIGURE_ARGS := \
                --infodir=/usr/info \
                $(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="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               CPPFLAGS="$(TARGET_CPPFLAGS)" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
                PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
                PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
 

diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index 23294fd39b1a7cd604464ec40ba5042cd59050ad..d88fc0583ccef2f6b758842f29b451ce26736179 100644 (file)
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -33,12 +33,17 @@ define Package/kexec-tools
   URL:=http://www.xmission.com/~ebiederm/files/kexec/README
 endef
 
+MAKE_FLAGS += \
+       DESTDIR="$(PKG_INSTALL_DIR)" \
+       EXTRA_CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
+       BUILD_CFLAGS="-O2" \
+       LIBS="$(TARGET_LDFLAGS) -lz" \
+       install
+
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
+       $(call Build/Compile/Default,)
 endef
 
 define Package/kexec-tools/install