From 994e8f8b081653569314a6143167ac064a3461df Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 7 Nov 2010 08:42:16 +0000
Subject: [PATCH] Merged from the ibmvstgt-port branch, such that the nightly
 build works again.

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2630 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 ibmvstgt/generate-in-tree-patches | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ibmvstgt/generate-in-tree-patches b/ibmvstgt/generate-in-tree-patches
index c5dede672..8ed811227 100755
--- a/ibmvstgt/generate-in-tree-patches
+++ b/ibmvstgt/generate-in-tree-patches
@@ -30,8 +30,11 @@ do
   g="${f#src/orig/${kernel_version}/}"
   f1="$f"
   f2="src/$g"
-  if [ ! -e "$f2" ]; then
-    f2="src/libsrpnew${f2#src/libsrp}"
+  if [ "${f2#src/libsrp.h}" != "${f2}" ]; then
+    f2="src/libsrpnew.h${f2#src/libsrp.h}"
+  fi
+  if [ "${f2#src/srp.h}" != "${f2}" ]; then
+    f2="src/srpnew.h${f2#src/srp.h}"
   fi
   if [ "$g" = "Makefile" ]; then
     f2="src/scsi-Makefile${f2#src/Makefile}"