From 665b02cb60c32268fa3c7129f70ee44255d64dd3 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Wed, 11 Oct 2006 21:24:42 +0000
Subject: [PATCH] build system: fix build in separate obj tree

---
 Makefile                |  1 +
 e2fsprogs/Kbuild        |  2 +-
 e2fsprogs/blkid/Kbuild  | 16 ++++++++--------
 e2fsprogs/ext2fs/Kbuild |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 5117c4550..077f5abf2 100644
--- a/Makefile
+++ b/Makefile
@@ -399,6 +399,7 @@ ifeq ($(config-targets),1)
 export KBUILD_DEFCONFIG
 
 config %config: scripts_basic outputmakefile FORCE
+	$(Q)mkdir -p include
 	$(Q)$(MAKE) $(build)=scripts/kconfig $@
 	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
 
diff --git a/e2fsprogs/Kbuild b/e2fsprogs/Kbuild
index edd0d5eab..b05bb92e1 100644
--- a/e2fsprogs/Kbuild
+++ b/e2fsprogs/Kbuild
@@ -13,4 +13,4 @@ lib-$(CONFIG_LSATTR)     += lsattr.o
 lib-$(CONFIG_MKE2FS)     += mke2fs.o util.o
 lib-$(CONFIG_TUNE2FS)    += tune2fs.o util.o
 
-CFLAGS += -include e2fsprogs/e2fsbb.h
+CFLAGS += -include $(srctree)/e2fsprogs/e2fsbb.h
diff --git a/e2fsprogs/blkid/Kbuild b/e2fsprogs/blkid/Kbuild
index 98b5c277f..ddcfdfd9a 100644
--- a/e2fsprogs/blkid/Kbuild
+++ b/e2fsprogs/blkid/Kbuild
@@ -13,11 +13,11 @@ lib-y:=
 lib-$(NEEDED-y) += cache.o dev.o devname.o devno.o blkid_getsize.o \
                    probe.o read.o resolve.o save.o tag.o list.o
 
-CFLAGS_dev.o := -include include/busybox.h
-CFLAGS_devname.o := -include include/busybox.h
-CFLAGS_devno.o := -include include/busybox.h
-CFLAGS_blkid_getsize.o := -include include/busybox.h
-CFLAGS_probe.o := -include include/busybox.h
-CFLAGS_save.o := -include include/busybox.h
-CFLAGS_tag.o := -include include/busybox.h
-CFLAGS_list.o := -include include/busybox.h
+CFLAGS_dev.o     := -include $(srctree)/include/busybox.h
+CFLAGS_devname.o := -include $(srctree)/include/busybox.h
+CFLAGS_devno.o   := -include $(srctree)/include/busybox.h
+CFLAGS_blkid_getsize.o := -include $(srctree)/include/busybox.h
+CFLAGS_probe.o   := -include $(srctree)/include/busybox.h
+CFLAGS_save.o    := -include $(srctree)/include/busybox.h
+CFLAGS_tag.o     := -include $(srctree)/include/busybox.h
+CFLAGS_list.o    := -include $(srctree)/include/busybox.h
diff --git a/e2fsprogs/ext2fs/Kbuild b/e2fsprogs/ext2fs/Kbuild
index d7d6f9a9b..185887a44 100644
--- a/e2fsprogs/ext2fs/Kbuild
+++ b/e2fsprogs/ext2fs/Kbuild
@@ -20,4 +20,4 @@ lib-$(NEEDED-y) += gen_bitmap.o bitops.o ismounted.o mkjournal.o unix_io.o \
                    dirhash.o version.o flushb.o unlink.o check_desc.o valid_blk.o \
                    ext_attr.o bmap.o dblist_dir.o ext2fs_inline.o swapfs.o
 
-CFLAGS += -include e2fsprogs/e2fsbb.h
+CFLAGS += -include $(srctree)/e2fsprogs/e2fsbb.h