From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 4 May 2010 13:57:37 +0000 (+0200)
Subject: merge mainline into intwrap
X-Git-Tag: 1.99~619^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4dff488793740582e7caf891e2f5782b573a513a;p=thirdparty%2Fgrub.git

merge mainline into intwrap
---

4dff488793740582e7caf891e2f5782b573a513a
diff --cc conf/i386-pc.rmk
index 2eca82d25,a5a1b08ea..b50655e9e
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@@ -53,10 -54,11 +53,10 @@@ kernel_img_SOURCES = kern/i386/pc/start
  	kern/env.c \
  	term/i386/pc/console.c term/i386/vga_common.c \
  	symlist.c
 -kernel_img_HEADERS += machine/biosdisk.h machine/vga.h machine/vbe.h \
 -	machine/pxe.h i386/pit.h
 +kernel_img_HEADERS += machine/pxe.h i386/pit.h machine/int.h
  kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
  kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
- kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
+ kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
  kernel_img_FORMAT = binary
  
  # Utilities.