diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-02-28 13:28:18 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-02-28 13:28:18 +0000 |
| commit | 5af0df16d07fbff270ccd6e4bb1cbd2f2d869c83 (patch) | |
| tree | cd914aa7a96f6a3892f09698bb21b58e2365e362 | |
| parent | f3940a66750b2edb681ac351d93c8ebdd18dc0aa (diff) | |
fix kexec-tools build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6428 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package.mk | 6 | ||||
| -rw-r--r-- | package/kexec-tools/Makefile | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/include/package.mk b/include/package.mk index 95508bc5d8..389ee5b6b0 100644 --- 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 23294fd39b..d88fc0583c 100644 --- 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 |