From b611a22ed02b67eb75ceb3388fcbc0343d31eed2 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 10 Feb 2010 19:32:31 +0000 Subject: [PATCH] Patch from Christian Motschke : I had some problems compiling scst due to some bashisms in the Makefiles. As you will know, Debian uses /bin/dash as default shell and /bin/sh is only a link to /bin/dash. I can either change the default shell, (or in my opinion the better solution) use SHELL=/bin/bash in the Makefile. I have made a patch for the Makefiles in question (I hope, that are all Makefiles). git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1496 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- Makefile | 2 ++ iscsi-scst/Makefile | 2 ++ qla2x00t/qla2x00-target/Makefile | 2 ++ scst/Makefile | 1 + scst/src/Makefile | 2 ++ scst/src/dev_handlers/Makefile | 2 ++ usr/fileio/Makefile | 2 ++ 7 files changed, 13 insertions(+) diff --git a/Makefile b/Makefile index 95133383d..983a061f1 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,8 @@ # # +SHELL = /bin/bash + # Decide to use which kernel src. If not specified, is current running kernel. #export KDIR=/usr/src/linux-2.6 diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile index dff281e38..f756709ea 100644 --- a/iscsi-scst/Makefile +++ b/iscsi-scst/Makefile @@ -5,6 +5,8 @@ # removes any old dependencies. DON'T put your own dependencies here # unless it's something special (not a .c file). +SHELL=/bin/bash + SUBDIRS := $(shell pwd) #SCST_INC_DIR := /usr/local/include/scst diff --git a/qla2x00t/qla2x00-target/Makefile b/qla2x00t/qla2x00-target/Makefile index 202d5c8f2..aae42e957 100644 --- a/qla2x00t/qla2x00-target/Makefile +++ b/qla2x00t/qla2x00-target/Makefile @@ -28,6 +28,8 @@ # - install and uninstall must be made as root # +SHELL=/bin/bash + #SCST_INC_DIR := /usr/local/include/scst #SCST_DIR := $(SCST_INC_DIR) SCST_INC_DIR := $(SUBDIRS)/../../scst/include diff --git a/scst/Makefile b/scst/Makefile index 4e5113d05..672b2c8f7 100644 --- a/scst/Makefile +++ b/scst/Makefile @@ -17,6 +17,7 @@ # # +SHELL=/bin/bash # Decide to use which kernel src. If not specified, is current running kernel. #export KDIR=/usr/src/linux-2.6 diff --git a/scst/src/Makefile b/scst/src/Makefile index feb26ac4d..09a9b65f0 100644 --- a/scst/src/Makefile +++ b/scst/src/Makefile @@ -27,6 +27,8 @@ # - install and uninstall must be made as root # +SHELL=/bin/bash + DEV_HANDLERS_DIR = dev_handlers ifneq ($(PATCHLEVEL),) diff --git a/scst/src/dev_handlers/Makefile b/scst/src/dev_handlers/Makefile index 7c370aca4..b347583e8 100644 --- a/scst/src/dev_handlers/Makefile +++ b/scst/src/dev_handlers/Makefile @@ -27,6 +27,8 @@ # - install and uninstall must be made as root # +SHELL=/bin/bash + ifneq ($(PATCHLEVEL),) SCST_INC_DIR := $(SUBDIRS)/../include diff --git a/usr/fileio/Makefile b/usr/fileio/Makefile index a8cff36c5..a362203fd 100644 --- a/usr/fileio/Makefile +++ b/usr/fileio/Makefile @@ -14,6 +14,8 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. +SHELL=/bin/bash + SRCS_F = fileio.c common.c debug.c OBJS_F = $(SRCS_F:.c=.o)