From 1ae73ffecfa074e345c75dc761931a767c9c9318 Mon Sep 17 00:00:00 2001
From: Ron Yorston <rmy@pobox.com>
Date: Wed, 21 Nov 2018 13:26:03 +0000
Subject: Allow build objects to go to a separate directory

Fix the build system so the KBUILD_OUTPUT environment variable can be
used as intended:  to specify that object files are placed in a separate
directory from the source.

Also ensure that busybox-w32.manifest is deleted by 'make mrproper'.
---
 Makefile                     | 1 +
 win32/resources/Kbuild.src   | 5 +++--
 win32/resources/resources.rc | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index ea40cd14b..b6aa3f158 100644
--- a/Makefile
+++ b/Makefile
@@ -983,6 +983,7 @@ MRPROPER_FILES += .config .config.old include/asm .version .old_version \
 		  include/applets.h \
 		  include/usage.h \
 		  applets/usage \
+		  win32/resources/busybox-w32.manifest \
 		  .kernelrelease Module.symvers tags TAGS cscope* \
 		  busybox_old
 
diff --git a/win32/resources/Kbuild.src b/win32/resources/Kbuild.src
index 73fbfb7c7..7cc010613 100644
--- a/win32/resources/Kbuild.src
+++ b/win32/resources/Kbuild.src
@@ -14,7 +14,8 @@ bb_level = $(or $(word 2,$(subst -, ,$1)),0)
 WRFLAGS := -D"KBUILD_STR(s)=\#s" -D"BB_VER=KBUILD_STR($(BB_VER))" \
 	-D"BB_VERSION=$(VERSION)" -D"BB_PATCHLEVEL=$(PATCHLEVEL)" \
 	-D"BB_SUBLEVEL=$(SUBLEVEL)" \
-	-D"BB_EXTRAVERSION=$(call bb_level,$(EXTRAVERSION))"
+	-D"BB_EXTRAVERSION=$(call bb_level,$(EXTRAVERSION))" \
+	--include-dir=$(objtree)/include --include-dir=$(objtree)/win32/resources
 
 quiet_cmd_windres = WINDRES $@
       cmd_windres = $(WINDRES) $(WRFLAGS) $< $@
@@ -27,4 +28,4 @@ win32/resources/resources.o: win32/resources/aterm.ico win32/resources/sterm.ico
 win32/resources/resources.o: win32/resources/busybox-w32.manifest
 
 win32/resources/busybox-w32.manifest: win32/resources/busybox-w32.manifest.src .config
-	@sed -b "s/VERSION/$(BB_VER)/" win32/resources/busybox-w32.manifest.src >win32/resources/busybox-w32.manifest
+	@sed -b "s/VERSION/$(BB_VER)/" $< >$@
diff --git a/win32/resources/resources.rc b/win32/resources/resources.rc
index 891f8a485..f77a3bcc9 100644
--- a/win32/resources/resources.rc
+++ b/win32/resources/resources.rc
@@ -1,4 +1,4 @@
-#include "../../include/autoconf.h"
+#include <autoconf.h>
 
 #if ENABLE_FEATURE_ICON_ATERM || ENABLE_FEATURE_ICON_ALL
 1 ICON "aterm.ico"
-- 
cgit v1.2.3-55-g6feb