[PATCH] x86: small build adjustment

[PATCH] x86: small build adjustment

[Jan Beulich]

Use build target when creating compatibility link, and use $(boot)
where possible.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

 arch/x86/Makefile_32 |    4 ++--
 arch/x86/Makefile_64 |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- linux-2.6.24-rc4/arch/x86/Makefile_32	2007-12-10 16:11:18.000000000 +0100
+++ 2.6.24-rc4-x86-link-compat/arch/x86/Makefile_32	2007-12-05 12:14:08.000000000 +0100
@@ -134,12 +134,12 @@ all: bzImage
 
 # KBUILD_IMAGE specify target image being built
                     KBUILD_IMAGE := $(boot)/bzImage
-zImage zlilo zdisk: KBUILD_IMAGE := arch/x86/boot/zImage
+zImage zlilo zdisk: KBUILD_IMAGE := $(boot)/zImage
 
 zImage bzImage: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE)
 	$(Q)mkdir -p $(objtree)/arch/i386/boot
-	$(Q)ln -fsn ../../x86/boot/bzImage $(objtree)/arch/i386/boot/bzImage
+	$(Q)ln -fsn ../../x86/boot/$@ $(objtree)/arch/i386/boot/$@
 
 compressed: zImage
 
--- linux-2.6.24-rc4/arch/x86/Makefile_64	2007-12-10 16:11:18.000000000 +0100
+++ 2.6.24-rc4-x86-link-compat/arch/x86/Makefile_64	2007-12-05 09:50:26.000000000 +0100
@@ -96,13 +96,13 @@ PHONY += bzImage bzlilo install archmrpr
 #Default target when executing "make"
 all: bzImage
 
-BOOTIMAGE                     := arch/x86/boot/bzImage
+BOOTIMAGE                     := $(boot)/bzImage
 KBUILD_IMAGE                  := $(BOOTIMAGE)
 
 bzImage: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) $(BOOTIMAGE)
 	$(Q)mkdir -p $(objtree)/arch/x86_64/boot
-	$(Q)ln -fsn ../../x86/boot/bzImage $(objtree)/arch/x86_64/boot/bzImage
+	$(Q)ln -fsn ../../x86/boot/$@ $(objtree)/arch/x86_64/boot/$@
 
 bzlilo: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) zlilo