From 831fe6de2f511dc0e3667bd83a053d20bcb1c4a8 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Thu, 29 Dec 2011 12:06:44 +0000
Subject: [PATCH] ib_srpt: Follow-up for r4035

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4036 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 srpt/Makefile              |  7 +++++--
 srpt/release-archive.patch | 11 -----------
 srpt/src/Makefile          |  5 ++++-
 3 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 srpt/release-archive.patch

diff --git a/srpt/Makefile b/srpt/Makefile
index 760d544b2..e9840e7cc 100644
--- a/srpt/Makefile
+++ b/srpt/Makefile
@@ -2,6 +2,9 @@
 # Makefile for ib_srpt.ko.
 #
 
+SCST_SYMVERS_DIR := $(shell if [ -e $$PWD/../scst ]; then	\
+                        echo $$PWD/../scst/src;			\
+                      else echo /usr/local/include/scst; fi)
 SUBDIRS := $(shell pwd)
 
 ifeq ($(KVER),)
@@ -55,7 +58,7 @@ install: all src/ib_srpt.ko
 	$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra/ib_srpt.ko
 	-/sbin/depmod -aq $(KVER)
 
-src/Module.symvers src/Modules.symvers:
+src/Module.symvers src/Modules.symvers: $(SCST_SYMVERS_DIR)/$(MODULE_SYMVERS)
 	@if $(OFED_KERNEL_IB_RPM_INSTALLED); then                           \
 	  if ! $(OFED_KERNEL_IB_DEVEL_RPM_INSTALLED); then                  \
 	    echo "Error: the OFED package kernel-ib-devel has not yet been" \
@@ -115,6 +118,6 @@ extraclean: clean
 	$(call set_var,build_mode,BUILDMODE,PERF)
 
 release-archive:
-	@version="$$(sed -n 's/^#define DRV_VERSION[ 	]*\"\([0-9.]*\).*/\1/p' src/ib_srpt.c)"; patch -sp0 <release-archive.patch && tar --owner=root --group=root --transform="s|^|srpt-$$version/|" -cjf srpt-$$version.tar.bz2 $$(svn status -v -q | cut -c11- | while read rev1 rev2 user path; do [ -d "$$path" ] || echo "$$path"; done) && patch -Rsp0 <release-archive.patch && ls -l srpt-$$version.tar.bz2
+	@version="$$(sed -n 's/^#define DRV_VERSION[ 	]*\"\([0-9.]*\).*/\1/p' src/ib_srpt.c)"; tar --owner=root --group=root --transform="s|^|srpt-$$version/|" -cjf srpt-$$version.tar.bz2 $$(svn status -v -q | grep -v '^D' | cut -c11- | while read rev1 rev2 user path; do [ -d "$$path" ] || echo "$$path"; done) && ls -l srpt-$$version.tar.bz2
 
 .PHONY: all install clean extraclean 2debug 2release 2perf
diff --git a/srpt/release-archive.patch b/srpt/release-archive.patch
deleted file mode 100644
index 1f9fafa77..000000000
--- a/srpt/release-archive.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: src/Makefile
-===================================================================
---- src/Makefile	(revision 4033)
-+++ src/Makefile	(working copy)
-@@ -1,6 +1,3 @@
--SCST_INC_DIR := $(SUBDIRS)/../../scst/include/
--EXTRA_CFLAGS += -I$(SCST_INC_DIR)
--
- -include $(SUBDIRS)/../build_mode
- 
- SRPTFLAGS = -DCONFIG_SCST_TRACING -DCONFIG_SCST_DEBUG \
diff --git a/srpt/src/Makefile b/srpt/src/Makefile
index c9e13f85c..299254551 100644
--- a/srpt/src/Makefile
+++ b/srpt/src/Makefile
@@ -1,4 +1,7 @@
-SCST_INC_DIR := $(SUBDIRS)/../../scst/include/
+SCST_INC_DIR := $(shell d="$(dir $(lastword $(MAKEFILE_LIST)))";	\
+                  if [ -e "$$d../../scst" ];				\
+                  then echo "$$d../../scst/include";			\
+                  else echo "/usr/local/include/scst"; fi)
 EXTRA_CFLAGS += -I$(SCST_INC_DIR)
 
 -include $(SUBDIRS)/../build_mode