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

Patch from Ruben Laban <r.laban@ism.nl>:

Browse Source 
I replaced all occurences of DISTDIR with DESTDIR and also introduced SBINDIR (and friends) to some other Makefiles. 



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@719 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2009-03-25 19:33:10 +00:00
parent 8ff3e56ef6
commit 643c7ab2d1
6 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -30,7 +30,7 @@ SRP_DIR=srpt
SCST_LOCAL_DIR=scst_local
ISCSI_DIR=iscsi-scst
#ISCSI_DISTDIR=../../../iscsi_scst_inst
#ISCSI_DESTDIR=../../../iscsi_scst_inst
help:
@echo " all : make all"
@@ -112,7 +112,7 @@ install:
# @if [ -d $(QLA_ISP_DIR) ]; then cd $(QLA_ISP_DIR) && $(MAKE) $@; fi
# @if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
# @if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) DISTDIR=$(ISCSI_DISTDIR) $@; fi
@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) DESTDIR=$(ISCSI_DESTDIR) $@; fi
@if [ -d $(USR_DIR) ]; then cd $(USR_DIR) && $(MAKE) $@; fi
@if [ -d $(SCST_LOCAL_DIR) ]; then cd $(SCST_LOCAL_DIR) && $(MAKE) $@; fi
@@ -214,7 +214,7 @@ iscsi:
cd $(ISCSI_DIR) && $(MAKE) all
iscsi_install:
cd $(ISCSI_DIR) && $(MAKE) DISTDIR=$(ISCSI_DISTDIR) install
cd $(ISCSI_DIR) && $(MAKE) DESTDIR=$(ISCSI_DESTDIR) install
iscsi_uninstall:
cd $(ISCSI_DIR) && $(MAKE) uninstall

18
iscsi-scst/Makefile
View File

@@ -12,6 +12,8 @@ SCST_INC_DIR := $(SUBDIRS)/../scst/include
#SCST_DIR := $(SCST_INC_DIR)
SCST_DIR := $(shell pwd)/../scst/src
SBINDIR := /usr/local/sbin
INITDIR := /etc/init.d
RCDIR := /etc/rc.d
ifeq ($(KVER),)
ifeq ($(KDIR),)
@@ -39,22 +41,22 @@ include/iscsi_scst_itf_ver.h: include/iscsi_scst.h
echo "\"`sha1sum include/iscsi_scst.h|awk '{printf $$1}'`\"" >>include/iscsi_scst_itf_ver.h
install: all
@install -vD usr/iscsi-scstd $(DISTDIR)$(SBINDIR)/iscsi-scstd
@install -vD usr/iscsi-scst-adm $(DISTDIR)$(SBINDIR)/iscsi-scst-adm
@install -vD usr/iscsi-scstd $(DESTDIR)$(SBINDIR)/iscsi-scstd
@install -vD usr/iscsi-scst-adm $(DESTDIR)$(SBINDIR)/iscsi-scst-adm
if [ -f /etc/debian_version ]; then \
install -vD -m 755 etc/initd/initd.debian $(DISTDIR)/etc/init.d/iscsi-scst; \
install -vD -m 755 etc/initd/initd.debian $(DESTDIR)$(INITDIR)/iscsi-scst; \
elif [ -f /etc/redhat-release ]; then \
install -vD -m 755 etc/initd/initd.redhat $(DISTDIR)/etc/init.d/iscsi-scst; \
install -vD -m 755 etc/initd/initd.redhat $(DESTDIR)$(INITDIR)/iscsi-scst; \
elif [ -f /etc/gentoo-release ]; then \
install -vD -m 755 etc/initd/initd.gentoo $(DISTDIR)/etc/init.d/iscsi-scst; \
install -vD -m 755 etc/initd/initd.gentoo $(DESTDIR)$(INITDIR)/iscsi-scst; \
elif [ -f /etc/slackware-version ]; then \
install -vD -m 755 etc/initd/initd $(DISTDIR)/etc/rc.d/iscsi-scst; \
install -vD -m 755 etc/initd/initd $(DESTDIR)$(RCDIR)/iscsi-scst; \
else \
install -vD -m 755 etc/initd/initd $(DISTDIR)/etc/init.d/iscsi-scst; \
install -vD -m 755 etc/initd/initd $(DESTDIR)$(INITDIR)/iscsi-scst; \
fi
@eval `sed -n 's/#define UTS_RELEASE /KERNELRELEASE=/p' $(KDIR)/include/linux/version.h $(KDIR)/include/linux/utsrelease.h 2>/dev/null`; \
install -vD -m 644 kernel/iscsi-scst.ko \
$(DISTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra/iscsi-scst.ko
$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra/iscsi-scst.ko
-/sbin/depmod -aq $(KVER)
SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Modules.symvers 2>/dev/null)

17
iscsi-scst/Makefile_user_space_only
View File

@@ -6,6 +6,9 @@
# unless it's something special (not a .c file).
SUBDIRS := $(shell pwd)
SBINDIR := /usr/local/sbin
INITDIR := /etc/init.d
RCDIR := /etc/rc.d
all: include/iscsi_scst_itf_ver.h progs
@@ -19,18 +22,18 @@ include/iscsi_scst_itf_ver.h: include/iscsi_scst.h
echo "\"`sha1sum include/iscsi_scst.h|awk '{printf $$1}'`\"" >>include/iscsi_scst_itf_ver.h
install: all
@install -vD usr/iscsi-scstd $(DISTDIR)/usr/local/sbin/iscsi-scstd
@install -vD usr/iscsi-scst-adm $(DISTDIR)/usr/local/sbin/iscsi-scst-adm
@install -vD usr/iscsi-scstd $(DESTDIR)$(SBINDIR)/iscsi-scstd
@install -vD usr/iscsi-scst-adm $(DESTDIR)$(SBINDIR)/iscsi-scst-adm
if [ -f /etc/debian_version ]; then \
install -vD -m 755 etc/initd/initd.debian $(DISTDIR)/etc/init.d/iscsi-scst; \
install -vD -m 755 etc/initd/initd.debian $(DESTDIR)$(INITDIR)/iscsi-scst; \
elif [ -f /etc/redhat-release ]; then \
install -vD -m 755 etc/initd/initd.redhat $(DISTDIR)/etc/init.d/iscsi-scst; \
install -vD -m 755 etc/initd/initd.redhat $(DESTDIR)$(INITDIR)/iscsi-scst; \
elif [ -f /etc/gentoo-release ]; then \
install -vD -m 755 etc/initd/initd.gentoo $(DISTDIR)/etc/init.d/iscsi-scst; \
install -vD -m 755 etc/initd/initd.gentoo $(DESTDIR)$(INITDIR)/iscsi-scst; \
elif [ -f /etc/slackware-version ]; then \
install -vD -m 755 etc/initd/initd $(DISTDIR)/etc/rc.d/iscsi-scst; \
install -vD -m 755 etc/initd/initd $(DESTDIR)$(RCDIR)/iscsi-scst; \
else \
install -vD -m 755 etc/initd/initd $(DISTDIR)/etc/init.d/iscsi-scst; \
install -vD -m 755 etc/initd/initd $(DESTDIR)$(INITDIR)/iscsi-scst; \
fi
clean:

6
scst/src/Makefile
View File

@@ -106,11 +106,11 @@ uninstall:
endif
ifeq ($(KVER),)
INSTALL_DIR := $(DISTDIR)/lib/modules/$(shell uname -r)/extra
INSTALL_DIR := $(DESTDIR)/lib/modules/$(shell uname -r)/extra
else
INSTALL_DIR := $(DISTDIR)/lib/modules/$(KVER)/extra
INSTALL_DIR := $(DESTDIR)/lib/modules/$(KVER)/extra
endif
INSTALL_DIR_H := $(DISTDIR)/usr/local/include/scst
INSTALL_DIR_H := $(DESTDIR)/usr/local/include/scst
EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextra -Wno-unused-parameter \
-Wno-missing-field-initializers

16
scstadmin/Makefile
View File

@@ -8,18 +8,18 @@ all: perl-module
install:
$(MAKE) -C scst-$(MODULE_VERSION) install
install -m 755 $(TOOL) $(DISTDIR)$(SBINDIR)
install -m 755 init.d/scst $(DISTDIR)$(INITDIR)
install -m 755 init.d/qla2x00t $(DISTDIR)$(INITDIR)
/usr/lib/lsb/install_initd scst
/usr/lib/lsb/install_initd qla2x00t
install -m 755 $(TOOL) $(DESTDIR)$(SBINDIR)
install -m 755 init.d/scst $(DESTDIR)$(INITDIR)
install -m 755 init.d/qla2x00t $(DESTDIR)$(INITDIR)
-/usr/lib/lsb/install_initd scst
-/usr/lib/lsb/install_initd qla2x00t
uninstall:
-/usr/lib/lsb/remove_initd qla2x00t
-/usr/lib/lsb/remove_initd scst
-rm -f $(DISTDIR)$(PATH_INITD)/qla2x00t
-rm -f $(DISTDIR)$(PATH_INITD)/scst
-rm -f $(DISTDIR)$(PATH_SBIN)/$(TOOL)
-rm -f $(DESTDIR)$(PATH_INITD)/qla2x00t
-rm -f $(DESTDIR)$(PATH_INITD)/scst
-rm -f $(DESTDIR)$(PATH_SBIN)/$(TOOL)
$(MAKE) -C scst-$(MODULE_VERSION) uninstall
perl-module:

2
srpt/Makefile
View File

@@ -27,7 +27,7 @@ all: Modules.symvers Module.symvers
install: all src/ib_srpt.ko
@eval `sed -n 's/#define UTS_RELEASE /KERNELRELEASE=/p' $(KDIR)/include/linux/version.h $(KDIR)/include/linux/utsrelease.h 2>/dev/null`; \
install -vD -m 644 src/ib_srpt.ko \
$(DISTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra/ib_srpt.ko
$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra/ib_srpt.ko
-/sbin/depmod -aq $(KVER)
SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Modules.symvers 2>/dev/null)