Makefile, scripts/Makefile, scripts/basic/Makefile, scripts/genksyms/Makefile,

scripts/kconfig/Makefile, scripts/mod/Makefile.real:
Properly specify top_srcdir.

svn path=/dists/trunk/linux-kbuild-2.6/; revision=13234

Makefile

@@ -7,4 +7,6 @@ SUBDIRS = \
 
 OUTDIR = .
 
+top_srcdir = .
+
 include $(top_srcdir)/Makefile.inc

scripts/Makefile

@@ -39,6 +39,8 @@ SUBDIRS = \
 
 OUTDIR = scripts
 
+top_srcdir = ..
+
 VPATH = $(top_srcdir)/kbuild/scripts
 
 include $(top_srcdir)/Makefile.inc

scripts/basic/Makefile

@@ -3,6 +3,9 @@ PROGS = \
 	fixdep
 
 OUTDIR = scripts/basic
-VPATH = $(top_srcdir)/kbuild/scripts/basic
+
+top_srcdir = ../..
+
+VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
 
 include $(top_srcdir)/Makefile.inc

scripts/genksyms/Makefile

@@ -1,9 +1,14 @@
 PROGS = genksyms
 
 OUTDIR = scripts/genksyms
-VPATH = $(top_srcdir)/kbuild/scripts/genksyms
 
-CFLAGS += -I$(top_srcdir)/kbuild/scripts/genksyms
+top_srcdir = ../..
+
+VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
+
+include $(top_srcdir)/Makefile.inc
+
+CFLAGS += -I$(VPATH)
 
 genksyms: genksyms.o parse.o lex.o
 
@@ -14,5 +19,3 @@ lex.o: keywords.c parse.h
 
 %.h: %.h_shipped
 	ln -s $< $@
-
-include $(top_srcdir)/Makefile.inc

scripts/kconfig/Makefile

@@ -1,9 +1,14 @@
 PROGS = conf
 
 OUTDIR = scripts/kconfig
-VPATH = $(top_srcdir)/kbuild/scripts/kconfig
 
-CFLAGS += -I$(top_srcdir)/kbuild/scripts/kconfig
+top_srcdir = ../..
+
+VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
+
+include $(top_srcdir)/Makefile.inc
+
+CFLAGS += -I$(VPATH)
 
 conf: conf.o zconf.tab.o
 
@@ -14,5 +19,3 @@ zconf.tab.c: zconf.hash.c lex.zconf.c
 
 %.h: %.h_shipped
 	ln -sf $< $@
-
-include $(top_srcdir)/Makefile.inc

scripts/mod/Makefile.real

@@ -1,5 +1,7 @@
 PROGS = modpost.real-$(TYPE)
 
+top_srcdir = ../..
+
 CFLAGS += -I$(top_srcdir)/kbuild/include
 
 include $(top_srcdir)/Makefile.inc