From 7abcac7f2204f77fc3df9188592c230dc26d0532 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 30 Jul 2015 17:07:29 +0000 Subject: [PATCH] ib_srpt, Makefile: Pass same flags to "make modules" and to "make install" (merge r6141 from trunk) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6447 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- srpt/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srpt/Makefile b/srpt/Makefile index f9e7dac5e..b20139108 100644 --- a/srpt/Makefile +++ b/srpt/Makefile @@ -78,19 +78,18 @@ OFED_MODULE_SYMVERS:=$(OFED_KERNEL_DIR)/$(MODULE_SYMVERS) endif AUTOCONF_FLAGS = $(shell $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/conftest/gid_change PRE_CFLAGS="$(OFED_CFLAGS)" >/dev/null 2>&1 && echo -DHAVE_IB_EVENT_GID_CHANGE) - +PRE_CFLAGS=$(OFED_CFLAGS) $(AUTOCONF_FLAGS) -DOFED_FLAVOR=$(OFED_FLAVOR) all: src/$(MODULE_SYMVERS) $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src \ - PRE_CFLAGS="$(OFED_CFLAGS) $(AUTOCONF_FLAGS) -DOFED_FLAVOR=$(OFED_FLAVOR)" \ - SCST_INC_DIR=$(SCST_INC_DIR) modules + PRE_CFLAGS="$(PRE_CFLAGS)" SCST_INC_DIR=$(SCST_INC_DIR) modules install: all @[ -z "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && \ find /lib/modules/$(KVER) -name ib_srpt.ko -exec rm {} \; ; \ true $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src \ - PRE_CFLAGS="$(OFED_CFLAGS)" SCST_INC_DIR=$(SCST_INC_DIR) \ + PRE_CFLAGS="$(PRE_CFLAGS)" SCST_INC_DIR=$(SCST_INC_DIR) \ $$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \ modules_install