Makefile, specs: Honour %{_sbindir} for helper tools

Fedora 42 maps %{_sbindir} to /usr/bin. Export SBINDIR=%{_sbindir} in
the spec files and let the iscsi-scst/scstadmin Makefiles honour that
variable.

Fixes "File not found: .../iscsi-scst-adm" on unified-/usr systems while
keeping older distros unchanged.
This commit is contained in:
Gleb Chesnokov
2025-04-18 18:15:05 +03:00
parent ef37ad252c
commit c934aee1a8
5 changed files with 5 additions and 5 deletions

View File

@@ -12,7 +12,7 @@ endif
SHELL=/bin/bash
SCST_DIR := $(shell echo "$$PWD")/../scst/src
SBINDIR := $(PREFIX)/sbin
SBINDIR ?= $(PREFIX)/sbin
INITDIR := /etc/init.d
RCDIR := /etc/rc.d
MANDIR ?= $(PREFIX)/man

View File

@@ -148,7 +148,7 @@ for d in scst fcst iscsi-scst qla2x00t-32gbit/qla2x00-target scst_local srpt; do
done
%install
export KVER=%{kversion} PREFIX=%{_prefix} MANDIR=%{_mandir} DEPMOD=true
export KVER=%{kversion} PREFIX=%{_prefix} MANDIR=%{_mandir} SBINDIR=%{_sbindir} DEPMOD=true
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

View File

@@ -142,7 +142,7 @@ done
%install
%{?kdir:export KDIR=%{kdir}}
%{!?kdir:%{?kversion:export KVER=%{kversion}}}
export PREFIX=%{_prefix} MANDIR=%{_mandir} DEPMOD=true
export PREFIX=%{_prefix} MANDIR=%{_mandir} SBINDIR=%{_sbindir} DEPMOD=true
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

View File

@@ -56,7 +56,7 @@ export PREFIX=%{_prefix} DESTDIR=%{buildroot} MANDIR=%{buildroot}%{_mandir}
%{make}
%install
export PREFIX=%{_prefix} DESTDIR=%{buildroot} MANDIR=%{buildroot}%{_mandir}
export PREFIX=%{_prefix} DESTDIR=%{buildroot} MANDIR=%{buildroot}%{_mandir} SBINDIR=%{_sbindir}
%{make} install_vendor
%scstadmin_perl_process_packlist
rm -rf %{buildroot}/var/adm/perl-modules/scst

View File

@@ -5,7 +5,7 @@ endif
MODULE_VERSION = 1.0.0
TOOL = scstadmin
SBINDIR := $(PREFIX)/sbin
SBINDIR ?= $(PREFIX)/sbin
all: perl-module