From 1890eee7b91f3d373321b42e3a830df14e3d93a6 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 16 Jun 2015 18:16:18 +0000 Subject: [PATCH] scstadmin: Rename the SCST-SCST Perl module into SCST_SCST From http://perldoc.perl.org/ExtUtils/MakeMaker.html: "NAME must be a valid Perl package name". Rename the Perl module to avoid that MakeMaker reports the following: Warning: NAME must be a package name git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6325 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scstadmin/Makefile | 4 ++++ scstadmin/scstadmin.procfs/scst-0.8.22/Makefile.PL | 4 ++-- scstadmin/scstadmin.procfs/scst-0.8.22/README | 6 +++--- scstadmin/scstadmin.spec.in | 2 +- scstadmin/scstadmin.sysfs/scst-0.9.10/Makefile.PL | 4 ++-- scstadmin/scstadmin.sysfs/scst-0.9.10/README | 6 +++--- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/scstadmin/Makefile b/scstadmin/Makefile index eebdbc9fe..c6791f5cf 100644 --- a/scstadmin/Makefile +++ b/scstadmin/Makefile @@ -83,6 +83,10 @@ install install_vendor: fi \ fi \ done + # Remove the files that are obsolete since SCST-SCST has been + # renamed into SCST_SCST. + rm -rf "$$(/usr/bin/perl -V:sitearch | sed "s|.*='||;s|'.*||")/auto/SCST-SCST" + # Install the files that have just been built. install -d $(DESTDIR)$(INITDIR) tmp=/tmp/scst-initd-$$$$ && init.d/scst >$$tmp && \ install -m 755 $$tmp $(DESTDIR)$(INITDIR)/scst && \ diff --git a/scstadmin/scstadmin.procfs/scst-0.8.22/Makefile.PL b/scstadmin/scstadmin.procfs/scst-0.8.22/Makefile.PL index 5b400f804..621b905d9 100644 --- a/scstadmin/scstadmin.procfs/scst-0.8.22/Makefile.PL +++ b/scstadmin/scstadmin.procfs/scst-0.8.22/Makefile.PL @@ -1,12 +1,12 @@ #!/usr/bin/perl -w # -# Makefile for the SCST-SCST perl module +# Makefile for the SCST_SCST perl module # use ExtUtils::MakeMaker; WriteMakefile( - 'NAME' => 'SCST-SCST', + 'NAME' => 'SCST_SCST', 'VERSION_FROM' => 'lib/SCST/SCST.pm', 'AUTHOR' => 'Mark R. Buechler ', 'PREREQ_PM' => {}, diff --git a/scstadmin/scstadmin.procfs/scst-0.8.22/README b/scstadmin/scstadmin.procfs/scst-0.8.22/README index 95df1880b..75b5b8f1f 100644 --- a/scstadmin/scstadmin.procfs/scst-0.8.22/README +++ b/scstadmin/scstadmin.procfs/scst-0.8.22/README @@ -1,15 +1,15 @@ -SCST-SCST is a perl module for querying and configuring SCST. +SCST_SCST is a perl module for querying and configuring SCST. AVAILABILITY -Currently SCST-SCST ships with SCST itself available from +Currently SCST_SCST ships with SCST itself available from http://scst.sourceforge.net. INSTALLATION -Install SCST-SCST as you would any other perl module: +Install SCST_SCST as you would any other perl module: perl Makefile.PL make diff --git a/scstadmin/scstadmin.spec.in b/scstadmin/scstadmin.spec.in index e1c57cf7f..3105c71f3 100644 --- a/scstadmin/scstadmin.spec.in +++ b/scstadmin/scstadmin.spec.in @@ -69,7 +69,7 @@ rm -f /usr/local/man/man5/scst.conf.5* /etc/init.d/scst %{_sbindir}/scstadmin %{perl_vendorlib}/SCST -%{perl_vendorarch}/auto/SCST-SCST +%{perl_vendorarch}/auto/SCST_SCST %{_mandir}/man1/scstadmin.1* %{scstadmin_perl_installvendorman3dir}/SCST::SCST.3pm* %{_mandir}/man5/scst.5* diff --git a/scstadmin/scstadmin.sysfs/scst-0.9.10/Makefile.PL b/scstadmin/scstadmin.sysfs/scst-0.9.10/Makefile.PL index 5b400f804..621b905d9 100644 --- a/scstadmin/scstadmin.sysfs/scst-0.9.10/Makefile.PL +++ b/scstadmin/scstadmin.sysfs/scst-0.9.10/Makefile.PL @@ -1,12 +1,12 @@ #!/usr/bin/perl -w # -# Makefile for the SCST-SCST perl module +# Makefile for the SCST_SCST perl module # use ExtUtils::MakeMaker; WriteMakefile( - 'NAME' => 'SCST-SCST', + 'NAME' => 'SCST_SCST', 'VERSION_FROM' => 'lib/SCST/SCST.pm', 'AUTHOR' => 'Mark R. Buechler ', 'PREREQ_PM' => {}, diff --git a/scstadmin/scstadmin.sysfs/scst-0.9.10/README b/scstadmin/scstadmin.sysfs/scst-0.9.10/README index 611c795af..34e6085ed 100644 --- a/scstadmin/scstadmin.sysfs/scst-0.9.10/README +++ b/scstadmin/scstadmin.sysfs/scst-0.9.10/README @@ -1,15 +1,15 @@ -SCST-SCST is a perl module for querying and configuring SCST. +SCST_SCST is a perl module for querying and configuring SCST. AVAILABILITY -Currently SCST-SCST ships with SCST itself available from +Currently SCST_SCST ships with SCST itself available from http://scst.sourceforge.net. INSTALLATION -Install SCST-SCST as you would any other perl module: +Install SCST_SCST as you would any other perl module: perl Makefile.PL make