mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-17 02:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

isert-scst: Rename SCST_DIR into SCST_SYMVERS_DIR

Browse Source 
Additionally, align shell code.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7083 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2016-12-27 20:25:13 +00:00
parent db5426169b
commit db36d29932
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
iscsi-scst/Makefile
View File

@@ -6,18 +6,25 @@
# unless it's something special (not a .c file).
ifndef PREFIX
PREFIX=/usr/local
PREFIX=/usr/local
endif
SHELL=/bin/bash
SUBDIRS := $(shell pwd)
SCST_INC_DIR := $(shell if [ -e "$$PWD/../scst" ]; \
then echo "$$PWD/../scst/include"; \
else echo "$(DESTDIR)$(PREFIX)/include/scst"; fi)
SCST_DIR := $(shell if [ -e "$$PWD/../scst" ]; then echo "$$PWD/../scst/src"; \
else echo "$(DESTDIR)$(PREFIX)/include/scst"; fi)
SCST_INC_DIR := $(shell \
if [ -e "$$PWD/../scst" ]; then \
echo "$$PWD/../scst/include"; \
else \
echo "$(DESTDIR)$(PREFIX)/include/scst"; \
fi)
SCST_SYMVERS_DIR := $(shell \
if [ -e "$$PWD/../scst" ]; then \
echo "$$PWD/../scst/src"; \
else \
echo "$(DESTDIR)$(PREFIX)/include/scst"; \
fi)
SBINDIR := $(PREFIX)/sbin
INITDIR := /etc/init.d
RCDIR := /etc/rc.d
@@ -156,26 +163,26 @@ uninstall:
$(INSTALL_DIR)/isert-scst.ko
-/sbin/depmod -b $(INSTALL_MOD_PATH)/ -a $(KVER)
SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Modules.symvers 2>/dev/null)
SCST_MOD_VERS := $(shell ls $(SCST_SYMVERS_DIR)/Modules.symvers 2>/dev/null)
ifneq ($(SCST_MOD_VERS),)
Modules.symvers: $(SCST_DIR)/Modules.symvers
Modules.symvers: $(SCST_SYMVERS_DIR)/Modules.symvers
echo $(SCST_MOD_VERS)
cp $(SCST_DIR)/Modules.symvers kernel/
cp $(SCST_SYMVERS_DIR)/Modules.symvers kernel/
echo "$@: INFINIBAND_ENABLED = $(INFINIBAND_ENABLED)"
if $(INFINIBAND_ENABLED); then \
cp $(SCST_DIR)/Modules.symvers kernel/isert-scst; \
if $(INFINIBAND_ENABLED); then \
cp $(SCST_SYMVERS_DIR)/Modules.symvers kernel/isert-scst; \
fi
else
.PHONY: Modules.symvers
endif
# It's renamed in 2.6.18
SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Module.symvers 2>/dev/null)
SCST_MOD_VERS := $(shell ls $(SCST_SYMVERS_DIR)/Module.symvers 2>/dev/null)
ifneq ($(SCST_MOD_VERS),)
Module.symvers: $(SCST_DIR)/Module.symvers
cp $(SCST_DIR)/Module.symvers kernel/
if $(INFINIBAND_ENABLED); then \
cp $(SCST_DIR)/Module.symvers kernel/isert-scst; \
Module.symvers: $(SCST_SYMVERS_DIR)/Module.symvers
cp $(SCST_SYMVERS_DIR)/Module.symvers kernel/
if $(INFINIBAND_ENABLED); then \
cp $(SCST_SYMVERS_DIR)/Module.symvers kernel/isert-scst; \
fi
else
.PHONY: Module.symvers