diff --git a/fcst/Makefile b/fcst/Makefile index 0ec551fd9..754dfcff5 100644 --- a/fcst/Makefile +++ b/fcst/Makefile @@ -68,11 +68,11 @@ MODULE_SYMVERS:=$(shell if [ -e "$(KDIR)/Modules.symvers" ]; then \ echo Modules.symvers; else echo Module.symvers; fi) all: $(MODULE_SYMVERS) - $(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m + $(MAKE) -C $(KDIR) M=$(shell pwd) install: all KDIR=$(KDIR) ../scripts/sign-modules - $(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \ + $(MAKE) -C $(KDIR) M=$(shell pwd) \ $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \ CONFIG_MODULE_SIG_ALL= modules_install diff --git a/qla2x00t-32gbit/Makefile b/qla2x00t-32gbit/Makefile index cc10e4799..9399cc155 100644 --- a/qla2x00t-32gbit/Makefile +++ b/qla2x00t-32gbit/Makefile @@ -61,12 +61,12 @@ qla2xxx_scst-objs := \ else all: - $(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \ + $(MAKE) -C $(KDIR) M=$(shell pwd) \ $(CONFIG_SCSI_QLA2XXX_TARGET)=CONFIG_SCSI_QLA2XXX_TARGET install: all KDIR=$(KDIR) ../scripts/sign-modules - $(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \ + $(MAKE) -C $(KDIR) M=$(shell pwd) \ $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \ CONFIG_MODULE_SIG_ALL= modules_install diff --git a/qla2x00t-32gbit/qla2x00-target/Makefile b/qla2x00t-32gbit/qla2x00-target/Makefile index b7a322c6a..2c883f1db 100644 --- a/qla2x00t-32gbit/qla2x00-target/Makefile +++ b/qla2x00t-32gbit/qla2x00-target/Makefile @@ -95,14 +95,14 @@ MODULE_SYMVERS:=$(shell if [ -e "$(KDIR)/Modules.symvers" ]; then \ echo Modules.symvers; else echo Module.symvers; fi) all: $(QLA2XXX_SCST) $(MODULE_SYMVERS) - $(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m + $(MAKE) -C $(KDIR) M=$(shell pwd) install: all ifneq ($(BUILD_2X_MODULE),) $(MAKE) M=$(QLA2XXX_DIR) -C $(QLA2XXX_DIR) $@ endif KDIR=$(KDIR) ../../scripts/sign-modules - $(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \ + $(MAKE) -C $(KDIR) M=$(shell pwd) \ $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \ CONFIG_MODULE_SIG_ALL= modules_install diff --git a/qla2x00t/Makefile b/qla2x00t/Makefile index aabec6e92..42a958213 100644 --- a/qla2x00t/Makefile +++ b/qla2x00t/Makefile @@ -56,7 +56,7 @@ qla2xxx_scst-objs := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o else all: - $(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \ + $(MAKE) -C $(KDIR) M=$(shell pwd) \ $(CONFIG_SCSI_QLA2XXX_TARGET)=CONFIG_SCSI_QLA2XXX_TARGET install: all diff --git a/qla2x00t/qla2x00-target/Makefile b/qla2x00t/qla2x00-target/Makefile index 46e7fde3b..37afcab6a 100644 --- a/qla2x00t/qla2x00-target/Makefile +++ b/qla2x00t/qla2x00-target/Makefile @@ -94,14 +94,14 @@ MODULE_SYMVERS:=$(shell if [ -e "$(KDIR)/Modules.symvers" ]; then \ echo Modules.symvers; else echo Module.symvers; fi) all: $(QLA2XXX_SCST) $(MODULE_SYMVERS) - $(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m + $(MAKE) -C $(KDIR) M=$(shell pwd) install: all ifneq ($(BUILD_2X_MODULE),) $(MAKE) M=$(QLA2XXX_DIR) -C $(QLA2XXX_DIR) $@ endif KDIR=$(KDIR) ../../scripts/sign-modules - $(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \ + $(MAKE) -C $(KDIR) M=$(shell pwd) \ $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \ CONFIG_MODULE_SIG_ALL= modules_install diff --git a/scst_local/Makefile b/scst_local/Makefile index 971b78777..f6a62aa75 100644 --- a/scst_local/Makefile +++ b/scst_local/Makefile @@ -48,11 +48,11 @@ MODULE_SYMVERS:=$(shell if [ -e "$(KDIR)/Modules.symvers" ]; then \ echo Modules.symvers; else echo Module.symvers; fi) all: $(MODULE_SYMVERS) - $(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m + $(MAKE) -C $(KDIR) M=$(shell pwd) install: all KDIR=$(KDIR) ../scripts/sign-modules - $(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \ + $(MAKE) -C $(KDIR) M=$(shell pwd) \ $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \ CONFIG_MODULE_SIG_ALL= modules_install