From ec49c2fa77a399aa926a04edd667f5fa26bfe132 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 04:16:40 +0000 Subject: [PATCH] Merge r7434 from trunk git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7687 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- ibmvstgt/Makefile | 4 ++-- scst/src/Makefile | 4 ++-- srpt/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ibmvstgt/Makefile b/ibmvstgt/Makefile index 2bc8ce127..732662885 100644 --- a/ibmvstgt/Makefile +++ b/ibmvstgt/Makefile @@ -30,8 +30,8 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra # The file Modules.symvers has been renamed in the 2.6.18 kernel to # Module.symvers. Find out which name to use by looking in $(KDIR). -MODULE_SYMVERS:=$(shell if [ -e $(KDIR)/Module.symvers ]; then \ - echo Module.symvers; else echo Modules.symvers; fi) +MODULE_SYMVERS:=$(shell if [ -e $(KDIR)/Modules.symvers ]; then \ + echo Modules.symvers; else echo Module.symvers; fi) all: src/$(MODULE_SYMVERS) diff --git a/scst/src/Makefile b/scst/src/Makefile index 13ec27664..7ef608c57 100644 --- a/scst/src/Makefile +++ b/scst/src/Makefile @@ -101,8 +101,8 @@ scst: # The file Modules.symvers has been renamed in the 2.6.18 kernel to # Module.symvers. Find out which name to use by looking in $(KDIR). -MODULE_SYMVERS:=$(shell if [ -e $(KDIR)/Module.symvers ]; then \ - echo Module.symvers; else echo Modules.symvers; fi) +MODULE_SYMVERS:=$(shell if [ -e $(KDIR)/Modules.symvers ]; then \ + echo Modules.symvers; else echo Module.symvers; fi) install: all @if [ -z "$(DESTDIR)" ] && \ diff --git a/srpt/Makefile b/srpt/Makefile index c06a73b76..21a82384c 100644 --- a/srpt/Makefile +++ b/srpt/Makefile @@ -50,8 +50,8 @@ SRC_FILES=$(wildcard */*.[ch]) # The file Modules.symvers has been renamed in the 2.6.18 kernel to # Module.symvers. Find out which name to use by looking in $(KDIR). -MODULE_SYMVERS:=$(shell if [ -e "$(KDIR)/Module.symvers" ]; then \ - echo Module.symvers; else echo Modules.symvers; fi) +MODULE_SYMVERS:=$(shell if [ -e "$(KDIR)/Modules.symvers" ]; then \ + echo Modules.symvers; else echo Module.symvers; fi) # Name of the OFED kernel package. OFED_KERNEL_IB_RPM:=$(shell for r in mlnx-ofa_kernel compat-rdma kernel-ib; do rpm -q $$r 2>/dev/null | grep -q "^$$r" && echo "$$r" && break; done)