From 35bca71f0cf2bf893a0ca2602758c6f59789e9e8 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 31 Aug 2015 17:27:10 +0000 Subject: [PATCH] scst.spec: Respect KDIR environment variable Reported-by: Consus git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6492 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- Makefile | 1 + scst.spec.in | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 93d8c76d1..e17b06726 100644 --- a/Makefile +++ b/Makefile @@ -453,6 +453,7 @@ scst-dkms-rpm: <$${name}.spec.in >$${name}.spec && \ MAKE="$(MAKE)" rpmbuild --define="%_topdir $${rpmtopdir}" \ $(if $(KVER),--define="%kversion $(KVER)") \ + $(if $(KDIR),--define="%kdir $(KDIR)") \ -ba $${name}.spec && \ rm -f $${name}-$(VERSION).tar.bz2 diff --git a/scst.spec.in b/scst.spec.in index e1a21f0a4..a1435fd83 100644 --- a/scst.spec.in +++ b/scst.spec.in @@ -105,6 +105,7 @@ Authors: %build export KVER=%{kversion} PREFIX=%{_prefix} +%{?kdir:%{expand:%%(export KDIR=%{kdir})}} export BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y make 2release for d in scst fcst iscsi-scst qla2x00t/qla2x00-target scst_local srpt; do @@ -113,6 +114,7 @@ done %install export KVER=%{kversion} PREFIX=%{_prefix} MANDIR=%{_mandir} +%{?kdir:%{expand:%%(export KDIR=%{kdir})}} export BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y for d in scst; do DESTDIR=%{buildroot} %{make} -C $d install