mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-17 12:46:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

scstadmin: Use the "install_vendor" method when building an RPM

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5132 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2013-11-19 17:20:45 +00:00
parent e3534beba8
commit 1463890112
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scstadmin/Makefile
+1 -1
View File
@@ -68,7 +68,7 @@ DEFAULTDIR := $(shell if [ -f /etc/gentoo-release ]; then \
all:
cd $(SCSTADMIN_DIR) && $(MAKE) $@
install:
install install_vendor:
@if [ -z "$(DESTDIR)" ] && rpm -q scstadmin >/dev/null 2>&1; then \
echo Error: the scstadmin RPM must be uninstalled first; false; fi
@if ! perl -MExtUtils::MakeMaker -e '' >/dev/null 2>&1; then \
scstadmin/scstadmin.spec.in
+6 -6
View File
@@ -25,8 +25,8 @@ Authors:
--------
Mark R. Buechler, Bart Van Assche and others
%define scstadmin_perl_installsiteman3dir \
%(perl -V:installsiteman3dir | sed "s|.*='||;s|'.*||")
%define scstadmin_perl_installvendorman3dir \
%(perl -V:installvendorman3dir | sed "s|.*='||;s|'.*||")
%define scstadmin_perl_process_packlist \
set -x;\
if test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT%perl_vendorarch/auto; then \
@@ -49,7 +49,7 @@ export PREFIX=%{_prefix} DESTDIR=%{buildroot} MANDIR=%{buildroot}%{_mandir}
%install
export PREFIX=%{_prefix} DESTDIR=%{buildroot} MANDIR=%{buildroot}%{_mandir}
%{make} install
%{make} install_vendor
%scstadmin_perl_process_packlist
rm -rf %{buildroot}/var/adm/perl-modules/scst
@@ -68,10 +68,10 @@ rm -f /usr/local/man/man5/scst.conf.5*
%config(noreplace) /etc/default/scst
/etc/init.d/scst
%{_sbindir}/scstadmin
%{perl_sitelib}/SCST
%{perl_sitearch}/auto/SCST-SCST
%{perl_vendorlib}/SCST
%{perl_vendorarch}/auto/SCST-SCST
%{_mandir}/man1/scstadmin.1*
%{scstadmin_perl_installsiteman3dir}/SCST::SCST.3pm*
%{scstadmin_perl_installvendorman3dir}/SCST::SCST.3pm*
%{_mandir}/man5/scst.5*
%{_mandir}/man5/scst.conf.5*
scstadmin/scstadmin.sysfs/Makefile
+2 -2
View File
@@ -9,8 +9,8 @@ SBINDIR := $(PREFIX)/sbin
all: perl-module
install: all
$(MAKE) -C scst-$(MODULE_VERSION) install DESTDIR=$(DESTDIR)
install install_vendor: all
$(MAKE) -C scst-$(MODULE_VERSION) $@ DESTDIR=$(DESTDIR)
install -d $(DESTDIR)$(SBINDIR)
install -m 755 $(TOOL) $(DESTDIR)$(SBINDIR)