2007-08-23 23:29:19

by Benjamin LaHaise

[permalink] [raw]
Subject: [PATCH i386] fix leak of ../kernel from top level directory in Makefile

This patch fixes a compile time error that results in the kernel being
unable to compile due to a reference to ../kernel from the top level
directory of the kernel source if a file ../kernel exists outside of the
kernel tree.

-ben

Signed-off-by: Benjamin LaHaise <[email protected]>
diff --git a/arch/i386/mach-generic/Makefile b/arch/i386/mach-generic/Makefile
index 77fbc9f..bd23339 100644
--- a/arch/i386/mach-generic/Makefile
+++ b/arch/i386/mach-generic/Makefile
@@ -2,6 +2,6 @@
# Makefile for the generic architecture
#

-EXTRA_CFLAGS += -I../kernel
+EXTRA_CFLAGS += -I$(TOPDIR)/arch/i386/kernel

obj-y := probe.o summit.o bigsmp.o es7000.o default.o ../mach-es7000/
diff --git a/arch/i386/mach-voyager/Makefile b/arch/i386/mach-voyager/Makefile
index f24d296..78898b7 100644
--- a/arch/i386/mach-voyager/Makefile
+++ b/arch/i386/mach-voyager/Makefile
@@ -2,7 +2,7 @@
# Makefile for the linux kernel.
#

-EXTRA_CFLAGS += -I../kernel
+EXTRA_CFLAGS += -I$(TOPDIR)/arch/i386/kernel
obj-y := setup.o voyager_basic.o voyager_thread.o

obj-$(CONFIG_SMP) += voyager_smp.o voyager_cat.o