From 708c83ad6920c0239ba38ca6cdfe08cf2bc11464 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 3 Aug 2020 02:57:23 +0000
Subject: [PATCH] Merge r9098 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.4.x@9099 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scripts/generate-kernel-patch | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index b6f3544e1..cc176cb69 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -458,8 +458,9 @@ if [ "${include_fcst}" = true ]; then
       done
   fi
 
-  add_file "fcst/Kbuild" \
-           "drivers/scst/fcst/Makefile"
+  for f in fcst/Kbuild fcst/Makefile_in-tree; do
+    [ -e "$f" ] && add_file "$f" "drivers/scst/fcst/Makefile"
+  done
 
   add_file "fcst/Kconfig" "drivers/scst/fcst/Kconfig"