diff --git a/debian/patches/revert-3566.patch b/debian/patches/revert-3566.patch
deleted file mode 100644
index 4df5b45..0000000
--- a/debian/patches/revert-3566.patch
+++ /dev/null
@@ -1,929 +0,0 @@
-Description: Revert upstream commit 3566, making build FTBFS
-Author: Gianfranco Costamagna <locutusofborg@debian.org>
-Last-Update: 2022-10-22
-
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/header.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/header.kmk
-@@ -1713,7 +1713,7 @@ endif
- 
- ##
- # An internal define used by subheader.kmk, subfooter.kmk, and
--# KB_FN_DO_PASS0_ON_TARGET.
-+# KB_FN_PASS_0_ON_TARGET.
- #
- # @param target    The target to process.
- #
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GCC.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GCC.kmk
-@@ -105,7 +105,7 @@ TOOL_GCC_COMPILE_C_DEPEND =
- TOOL_GCC_COMPILE_C_DEPORD =
- define TOOL_GCC_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GCC_CC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -131,7 +131,7 @@ TOOL_GCC_COMPILE_CXX_DEPEND =
- TOOL_GCC_COMPILE_CXX_DEPORD =
- define TOOL_GCC_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GCC_CXX) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -157,7 +157,7 @@ TOOL_GCC_COMPILE_AS_DEPEND =
- TOOL_GCC_COMPILE_AS_DEPORD =
- define TOOL_GCC_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GCC_AS) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
- 		-o $(obj)\
- 		$(abspath $(source))
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GCC3.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GCC3.kmk
-@@ -133,7 +133,7 @@ define TOOL_GCC3_COMPILE_C_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GCC3_CC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -147,7 +147,7 @@ else # !KBUILD_USE_KOBJCACHE
- TOOL_GCC3_COMPILE_C_OUTPUT =
- define TOOL_GCC3_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GCC3_CC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -177,7 +177,7 @@ define TOOL_GCC3_COMPILE_CXX_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC3_CXX) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -191,7 +191,7 @@ else # !KBUILD_USE_KOBJCACHE
- TOOL_GCC3_COMPILE_CXX_OUTPUT =
- define TOOL_GCC3_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GCC3_CXX) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -218,7 +218,7 @@ TOOL_GCC3_COMPILE_AS_DEPEND =
- TOOL_GCC3_COMPILE_AS_DEPORD =
- define TOOL_GCC3_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GCC3_AS) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GCC32.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GCC32.kmk
-@@ -133,7 +133,7 @@ define TOOL_GCC32_COMPILE_C_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GCC32_CC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -147,7 +147,7 @@ else # !KBUILD_USE_KOBJCACHE
- TOOL_GCC32_COMPILE_C_OUTPUT =
- define TOOL_GCC32_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GCC32_CC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -177,7 +177,7 @@ define TOOL_GCC32_COMPILE_CXX_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC32_CXX) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -192,7 +192,7 @@ else # !KBUILD_USE_KOBJCACHE
- TOOL_GCC32_COMPILE_CXX_OUTPUT =
- define TOOL_GCC32_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GCC32_CXX) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -219,7 +219,7 @@ TOOL_GCC32_COMPILE_AS_DEPEND =
- TOOL_GCC32_COMPILE_AS_DEPORD =
- define TOOL_GCC32_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GCC32_AS) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GCC3OMF.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GCC3OMF.kmk
-@@ -116,7 +116,7 @@ define TOOL_GCC3OMF_COMPILE_C_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GCC3OMF_CC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -130,7 +130,7 @@ else # !KBUILD_USE_KOBJCACHE
- TOOL_GCC3OMF_COMPILE_C_OUTPUT =
- define TOOL_GCC3OMF_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GCC3OMF_CC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -161,7 +161,7 @@ define TOOL_GCC3OMF_COMPILE_CXX_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC3OMF_CXX) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -175,7 +175,7 @@ else # !KBUILD_USE_KOBJCACHE
- TOOL_GCC3OMF_COMPILE_CXX_OUTPUT =
- define TOOL_GCC3OMF_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GCC3OMF_CXX) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -202,7 +202,7 @@ TOOL_GCC3OMF_COMPILE_AS_DEPEND =
- TOOL_GCC3OMF_COMPILE_AS_DEPORD =
- define TOOL_GCC3OMF_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GCC3OMF_AS) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GCC3PLAIN.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GCC3PLAIN.kmk
-@@ -118,7 +118,7 @@ define TOOL_GCC3PLAIN_COMPILE_C_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GCC3PLAIN_CC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -132,7 +132,7 @@ else # !KBUILD_USE_KOBJCACHE
- TOOL_GCC3PLAIN_COMPILE_C_OUTPUT =
- define TOOL_GCC3PLAIN_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GCC3PLAIN_CC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -162,7 +162,7 @@ define TOOL_GCC3PLAIN_COMPILE_CXX_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC3PLAIN_CXX) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -176,7 +176,7 @@ else # !KBUILD_USE_KOBJCACHE
- TOOL_GCC3PLAIN_COMPILE_CXX_OUTPUT =
- define TOOL_GCC3PLAIN_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GCC3PLAIN_CXX) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -203,7 +203,7 @@ TOOL_GCC3PLAIN_COMPILE_AS_DEPEND =
- TOOL_GCC3PLAIN_COMPILE_AS_DEPORD =
- define TOOL_GCC3PLAIN_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GCC3PLAIN_AS) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GCC42MACHO.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GCC42MACHO.kmk
-@@ -157,7 +157,7 @@ define TOOL_GCC42MACHO_COMPILE_C_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GCC42MACHO_CC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -171,7 +171,7 @@ else  # !KBUILD_USE_KOBJCACHE
- TOOL_GCC42MACHO_COMPILE_C_OUTPUT =
- define TOOL_GCC42MACHO_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GCC42MACHO_CC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -201,7 +201,7 @@ define TOOL_GCC42MACHO_COMPILE_CXX_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC42MACHO_CXX) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -215,7 +215,7 @@ else  # !KBUILD_USE_KOBJCACHE
- TOOL_GCC42MACHO_COMPILE_CXX_OUTPUT =
- define TOOL_GCC42MACHO_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GCC42MACHO_CXX) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -245,7 +245,7 @@ define TOOL_GCC42MACHO_COMPILE_OBJC_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC42MACHO_OBJC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -259,7 +259,7 @@ else  # !KBUILD_USE_KOBJCACHE
- TOOL_GCC42MACHO_COMPILE_OBJC_OUTPUT =
- define TOOL_GCC42MACHO_COMPILE_OBJC_CMDS
- 	$(QUIET)$(TOOL_GCC42MACHO_OBJC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -289,7 +289,7 @@ define TOOL_GCC42MACHO_COMPILE_OBJCXX_CM
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).mii\
- 		$(TOOL_GCC42MACHO_OBJCXX) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -303,7 +303,7 @@ else  # !KBUILD_USE_KOBJCACHE
- TOOL_GCC42MACHO_COMPILE_OBJCXX_OUTPUT =
- define TOOL_GCC42MACHO_COMPILE_OBJCXX_CMDS
- 	$(QUIET)$(TOOL_GCC42MACHO_OBJCXX) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -330,7 +330,7 @@ TOOL_GCC42MACHO_COMPILE_AS_DEPEND =
- TOOL_GCC42MACHO_COMPILE_AS_DEPORD =
- define TOOL_GCC42MACHO_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GCC42MACHO_AS) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GCC4MACHO.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GCC4MACHO.kmk
-@@ -157,7 +157,7 @@ define TOOL_GCC4MACHO_COMPILE_C_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GCC4MACHO_CC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -171,7 +171,7 @@ else  # !KBUILD_USE_KOBJCACHE
- TOOL_GCC4MACHO_COMPILE_C_OUTPUT =
- define TOOL_GCC4MACHO_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GCC4MACHO_CC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -201,7 +201,7 @@ define TOOL_GCC4MACHO_COMPILE_CXX_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC4MACHO_CXX) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -215,7 +215,7 @@ else  # !KBUILD_USE_KOBJCACHE
- TOOL_GCC4MACHO_COMPILE_CXX_OUTPUT =
- define TOOL_GCC4MACHO_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GCC4MACHO_CXX) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -245,7 +245,7 @@ define TOOL_GCC4MACHO_COMPILE_OBJC_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC4MACHO_OBJC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -259,7 +259,7 @@ else  # !KBUILD_USE_KOBJCACHE
- TOOL_GCC4MACHO_COMPILE_OBJC_OUTPUT =
- define TOOL_GCC4MACHO_COMPILE_OBJC_CMDS
- 	$(QUIET)$(TOOL_GCC4MACHO_OBJC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -289,7 +289,7 @@ define TOOL_GCC4MACHO_COMPILE_OBJCXX_CMD
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).mii\
- 		$(TOOL_GCC4MACHO_OBJCXX) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -303,7 +303,7 @@ else  # !KBUILD_USE_KOBJCACHE
- TOOL_GCC4MACHO_COMPILE_OBJCXX_OUTPUT =
- define TOOL_GCC4MACHO_COMPILE_OBJCXX_CMDS
- 	$(QUIET)$(TOOL_GCC4MACHO_OBJCXX) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -330,7 +330,7 @@ TOOL_GCC4MACHO_COMPILE_AS_DEPEND =
- TOOL_GCC4MACHO_COMPILE_AS_DEPORD =
- define TOOL_GCC4MACHO_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GCC4MACHO_AS) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GCC64.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GCC64.kmk
-@@ -132,7 +132,7 @@ define TOOL_GCC64_COMPILE_C_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GCC64_CC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -146,7 +146,7 @@ else # !KBUILD_USE_KOBJCACHE
- TOOL_GCC64_COMPILE_C_OUTPUT =
- define TOOL_GCC64_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GCC64_CC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -176,7 +176,7 @@ define TOOL_GCC64_COMPILE_CXX_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC64_CXX) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -190,7 +190,7 @@ else # !KBUILD_USE_KOBJCACHE
- TOOL_GCC64_COMPILE_CXX_OUTPUT =
- define TOOL_GCC64_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GCC64_CXX) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -217,7 +217,7 @@ TOOL_GCC64_COMPILE_AS_DEPEND =
- TOOL_GCC64_COMPILE_AS_DEPORD =
- define TOOL_GCC64_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GCC64_AS) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GXX.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GXX.kmk
-@@ -120,7 +120,7 @@ TOOL_GXX_COMPILE_C_DEPEND =
- TOOL_GXX_COMPILE_C_DEPORD =
- define TOOL_GXX_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GXX_CC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -146,7 +146,7 @@ TOOL_GXX_COMPILE_CXX_DEPEND = $($(target
- TOOL_GXX_COMPILE_CXX_DEPORD =
- define TOOL_GXX_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GXX_CXX) -c\
--		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
- 		,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \
-@@ -172,7 +172,7 @@ TOOL_GXX_COMPILE_PCH_DEPEND =
- TOOL_GXX_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR)
- define TOOL_GXX_COMPILE_PCH_CMDS
- 	$(QUIET)$(TOOL_GXX_PCH) -c\
--		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -199,7 +199,7 @@ TOOL_GXX_COMPILE_AS_DEPEND =
- TOOL_GXX_COMPILE_AS_DEPORD =
- define TOOL_GXX_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GXX_AS) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
- 		-o $(obj)\
- 		$(abspath $(source))
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GXX3.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GXX3.kmk
-@@ -142,7 +142,7 @@ if "$(use_objcache)" != ""
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GXX3_CC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -152,7 +152,7 @@ if "$(use_objcache)" != ""
- 		-
- else
- 	$(QUIET)$(TOOL_GXX3_CC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -183,7 +183,7 @@ if "$(use_objcache)" != ""
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GXX3_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
- 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -193,7 +193,7 @@ if "$(use_objcache)" != ""
- 		-
- else
- 	$(QUIET)$(TOOL_GXX3_CXX) -c\
--		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
- 		,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \
-@@ -220,7 +220,7 @@ TOOL_GXX3_COMPILE_PCH_DEPEND =
- TOOL_GXX3_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR)
- define TOOL_GXX3_COMPILE_PCH_CMDS
- 	$(QUIET)$(TOOL_GXX3_PCH) -c\
--		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -247,7 +247,7 @@ TOOL_GXX3_COMPILE_AS_DEPEND =
- TOOL_GXX3_COMPILE_AS_DEPORD =
- define TOOL_GXX3_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GXX3_AS) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GXX32.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GXX32.kmk
-@@ -140,7 +140,7 @@ if "$(use_objcache)" != ""
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GXX32_CC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -150,7 +150,7 @@ if "$(use_objcache)" != ""
- 		-
- else
- 	$(QUIET)$(TOOL_GXX32_CC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -181,7 +181,7 @@ if "$(use_objcache)" != ""
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GXX32_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
- 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -191,7 +191,7 @@ if "$(use_objcache)" != ""
- 		-
- else
- 	$(QUIET)$(TOOL_GXX32_CXX) -c\
--		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
- 		,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \
-@@ -218,7 +218,7 @@ TOOL_GXX32_COMPILE_PCH_DEPEND =
- TOOL_GXX32_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR)
- define TOOL_GXX32_COMPILE_PCH_CMDS
- 	$(QUIET)$(TOOL_GXX32_PCH) -c\
--		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -245,7 +245,7 @@ TOOL_GXX32_COMPILE_AS_DEPEND =
- TOOL_GXX32_COMPILE_AS_DEPORD =
- define TOOL_GXX32_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GXX32_AS) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GXX3OMF.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GXX3OMF.kmk
-@@ -128,7 +128,7 @@ if "$(use_objcache)" != ""
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GXX3OMF_CC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -138,7 +138,7 @@ if "$(use_objcache)" != ""
- 		-
- else
- 	$(QUIET)$(TOOL_GXX3OMF_CC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -169,7 +169,7 @@ if "$(use_objcache)" != ""
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GXX3OMF_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
- 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -179,7 +179,7 @@ if "$(use_objcache)" != ""
- 		-
- else
- 	$(QUIET)$(TOOL_GXX3OMF_CXX) -c\
--		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
- 		,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \
-@@ -206,7 +206,7 @@ TOOL_GXX3OMF_COMPILE_PCH_DEPEND =
- TOOL_GXX3OMF_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR)
- define TOOL_GXX3OMF_COMPILE_PCH_CMDS
- 	$(QUIET)$(TOOL_GXX3OMF_PCH) -c\
--		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -233,7 +233,7 @@ TOOL_GXX3OMF_COMPILE_AS_DEPEND =
- TOOL_GXX3OMF_COMPILE_AS_DEPORD =
- define TOOL_GXX3OMF_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GXX3OMF_AS) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GXX3PLAIN.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GXX3PLAIN.kmk
-@@ -126,7 +126,7 @@ if "$(use_objcache)" != ""
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GXX3PLAIN_CC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -136,7 +136,7 @@ if "$(use_objcache)" != ""
- 		-
- else
- 	$(QUIET)$(TOOL_GXX3PLAIN_CC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -167,7 +167,7 @@ if "$(use_objcache)" != ""
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GXX3PLAIN_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
- 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -177,7 +177,7 @@ if "$(use_objcache)" != ""
- 		-
- else
- 	$(QUIET)$(TOOL_GXX3PLAIN_CXX) -c\
--		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
- 		,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \
-@@ -204,7 +204,7 @@ TOOL_GXX3PLAIN_COMPILE_PCH_DEPEND =
- TOOL_GXX3PLAIN_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR)
- define TOOL_GXX3PLAIN_COMPILE_PCH_CMDS
- 	$(QUIET)$(TOOL_GXX3PLAIN_PCH) -c\
--		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -231,7 +231,7 @@ TOOL_GXX3PLAIN_COMPILE_AS_DEPEND =
- TOOL_GXX3PLAIN_COMPILE_AS_DEPORD =
- define TOOL_GXX3PLAIN_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GXX3PLAIN_AS) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GXX42MACHO.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GXX42MACHO.kmk
-@@ -166,7 +166,7 @@ if "$(use_objcache)" != ""
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GXX42MACHO_CC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -176,7 +176,7 @@ if "$(use_objcache)" != ""
- 		-
- else
- 	$(QUIET)$(TOOL_GXX42MACHO_CC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -207,7 +207,7 @@ if "$(use_objcache)" != ""
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GXX42MACHO_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
- 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -217,7 +217,7 @@ if "$(use_objcache)" != ""
- 		-
- else
- 	$(QUIET)$(TOOL_GXX42MACHO_CXX) -c\
--		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
- 		,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \
-@@ -244,7 +244,7 @@ TOOL_GXX42MACHO_COMPILE_PCH_DEPEND =
- TOOL_GXX42MACHO_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR)
- define TOOL_GXX42MACHO_COMPILE_PCH_CMDS
- 	$(QUIET)$(TOOL_GXX42MACHO_PCH) -c\
--		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -274,7 +274,7 @@ define TOOL_GXX42MACHO_COMPILE_OBJC_CMDS
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GXX42MACHO_OBJC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -288,7 +288,7 @@ else  # !KBUILD_USE_KOBJCACHE
- TOOL_GXX42MACHO_COMPILE_OBJC_OUTPUT =
- define TOOL_GXX42MACHO_COMPILE_OBJC_CMDS
- 	$(QUIET)$(TOOL_GXX42MACHO_OBJC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -318,7 +318,7 @@ define TOOL_GXX42MACHO_COMPILE_OBJCXX_CM
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).mii\
- 		$(TOOL_GXX42MACHO_OBJCXX) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -332,7 +332,7 @@ else  # !KBUILD_USE_KOBJCACHE
- TOOL_GXX42MACHO_COMPILE_OBJCXX_OUTPUT =
- define TOOL_GXX42MACHO_COMPILE_OBJCXX_CMDS
- 	$(QUIET)$(TOOL_GXX42MACHO_OBJCXX) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -359,7 +359,7 @@ TOOL_GXX42MACHO_COMPILE_AS_DEPEND =
- TOOL_GXX42MACHO_COMPILE_AS_DEPORD =
- define TOOL_GXX42MACHO_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GXX42MACHO_AS) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GXX4MACHO.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GXX4MACHO.kmk
-@@ -166,7 +166,7 @@ if "$(use_objcache)" != ""
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GXX4MACHO_CC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -176,7 +176,7 @@ if "$(use_objcache)" != ""
- 		-
- else
- 	$(QUIET)$(TOOL_GXX4MACHO_CC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -207,7 +207,7 @@ if "$(use_objcache)" != ""
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GXX4MACHO_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
- 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -217,7 +217,7 @@ if "$(use_objcache)" != ""
- 		-
- else
- 	$(QUIET)$(TOOL_GXX4MACHO_CXX) -c\
--		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
- 		,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \
-@@ -244,7 +244,7 @@ TOOL_GXX4MACHO_COMPILE_PCH_DEPEND =
- TOOL_GXX4MACHO_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR)
- define TOOL_GXX4MACHO_COMPILE_PCH_CMDS
- 	$(QUIET)$(TOOL_GXX4MACHO_PCH) -c\
--		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -274,7 +274,7 @@ define TOOL_GXX4MACHO_COMPILE_OBJCXX_CMD
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).mii\
- 		$(TOOL_GXX4MACHO_OBJCXX) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -288,7 +288,7 @@ else  # !KBUILD_USE_KOBJCACHE
- TOOL_GXX4MACHO_COMPILE_OBJCXX_OUTPUT =
- define TOOL_GXX4MACHO_COMPILE_OBJCXX_CMDS
- 	$(QUIET)$(TOOL_GXX4MACHO_OBJCXX) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -315,7 +315,7 @@ TOOL_GXX4MACHO_COMPILE_AS_DEPEND =
- TOOL_GXX4MACHO_COMPILE_AS_DEPORD =
- define TOOL_GXX4MACHO_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GXX4MACHO_AS) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
---- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GXX64.kmk
-+++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GXX64.kmk
-@@ -140,7 +140,7 @@ if "$(use_objcache)" != ""
- 	$(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GXX64_CC) -E -o -\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -150,7 +150,7 @@ if "$(use_objcache)" != ""
- 		-
- else
- 	$(QUIET)$(TOOL_GXX64_CC) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -181,7 +181,7 @@ if "$(use_objcache)" != ""
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GXX64_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
- 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
- 		--kObjCache-cc $(obj)\
-@@ -191,7 +191,7 @@ if "$(use_objcache)" != ""
- 		-
- else
- 	$(QUIET)$(TOOL_GXX64_CXX) -c\
--		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
- 		,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \
-@@ -218,7 +218,7 @@ TOOL_GXX64_COMPILE_PCH_DEPEND =
- TOOL_GXX64_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR)
- define TOOL_GXX64_COMPILE_PCH_CMDS
- 	$(QUIET)$(TOOL_GXX64_PCH) -c\
--		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
-@@ -245,7 +245,7 @@ TOOL_GXX64_COMPILE_AS_DEPEND =
- TOOL_GXX64_COMPILE_AS_DEPORD =
- define TOOL_GXX64_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GXX64_AS) -c\
--		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-+		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
- 		$(abspath $(source))
diff --git a/debian/patches/series b/debian/patches/series
index 4e53d30..6ff8c8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 do-not-build-docs.patch
 build-fix
 assert.patch
-revert-3566.patch