[backfire] merge r20739

[openwrt-10.03/.git] / package / grub / Makefile

diff --git a/package/grub/Makefile b/package/grub/Makefile
index 434af2bc9b78a8b98521f81cd349ceaa5360b871..338dbcac1de22b32dfb84c6a2ba77a9315dc3f38 100644 (file)
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -1,17 +1,16 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 4855 2006-09-24 20:49:31Z nico $
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=grub
 PKG_VERSION:=0.97
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://alpha.gnu.org/gnu/grub
@@ -22,6 +21,8 @@ PKG_TARGETS:=bin
 
 include $(INCLUDE_DIR)/package.mk
 
+export grub_cv_prog_objcopy_absolute=yes
+
 define Package/grub
   SECTION:=boot
   DEPENDS:=@TARGET_x86
@@ -30,20 +31,10 @@ define Package/grub
   URL:=http://www.gnu.org/software/grub/
 endef
 
-ifeq ($(HOST_OS),Linux)
-  NATIVEGRUB-i386:=1
-  NATIVEGRUB-i686:=1
-  NATIVEGRUB:=$(NATIVEGRUB-$(HOST_ARCH))
-endif
-
-ifeq ($(NATIVEGRUB),)
 CONFIGURE_FLAGS:= \
        --target=$(GNU_TARGET_NAME) \
        --host=$(GNU_TARGET_NAME) \
        --build=$(GNU_HOST_NAME)
-else
-CONFIGURE_FLAGS:=
-endif
 
 ifneq ($(HOST_OS),Darwin)
 define Build/Configure