From d25d044b3f1f82fa97c6af9c7190ed395d9b6edf Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bart.vanassche@sandisk.com>
Date: Fri, 11 Dec 2015 20:03:09 +0000
Subject: [PATCH] scstadmin: Fix SCST/SCST.pm path

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6736 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scstadmin/scstadmin.sysfs/Makefile  |  6 ++++--
 scstadmin/scstadmin.sysfs/scstadmin | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/scstadmin/scstadmin.sysfs/Makefile b/scstadmin/scstadmin.sysfs/Makefile
index e9c01f486..d86e3df78 100644
--- a/scstadmin/scstadmin.sysfs/Makefile
+++ b/scstadmin/scstadmin.sysfs/Makefile
@@ -13,14 +13,16 @@ install install_vendor: all
 	$(MAKE) -C scst-$(MODULE_VERSION) $@ DESTDIR=$(DESTDIR)
 	install -d $(DESTDIR)$(SBINDIR)
 	install -m 755 $(TOOL) $(DESTDIR)$(SBINDIR)
+	regex="s|%INSTALLSITELIB%|$$(make -sC scst-$(MODULE_VERSION) print-INSTALLSITELIB | grep -v ^make)|"; echo "$${regex}"; sed -i "$${regex}" $(DESTDIR)$(SBINDIR)/$(TOOL)
 
 uninstall:
 	-rm -f $(DESTDIR)$(SBINDIR)/$(TOOL)
 	$(MAKE) -C scst-$(MODULE_VERSION) uninstall
 
 perl-module:
-	@cd ./scst-$(MODULE_VERSION); \
-	perl Makefile.PL PREFIX=$(PREFIX);
+	@cd ./scst-$(MODULE_VERSION) &&		\
+	perl Makefile.PL PREFIX=$(PREFIX) &&	\
+	printf '\nprint-%%:\n\t@echo '"'"'$$($$*)'"'"'\n' >> Makefile
 	$(MAKE) -C scst-$(MODULE_VERSION)
 
 test:
diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin
index fc908f6c7..fc5b1b3c1 100755
--- a/scstadmin/scstadmin.sysfs/scstadmin
+++ b/scstadmin/scstadmin.sysfs/scstadmin
@@ -242,12 +242,27 @@ Examples:
 EndUsage
   }
 
+use strict;
+use Cwd qw(abs_path);
+use File::Basename;
+use File::Spec;
+use Test;
+
+BEGIN {
+	my $site_lib = '%INSTALLSITELIB%';
+	if ($site_lib =~ '^%') {
+		my $scstadmindir = dirname(abs_path($0));
+		$site_lib = File::Spec->catdir($scstadmindir, "scst-0.9.10",
+					       "blib", "lib");
+	}
+	unshift(@INC, $site_lib);
+}
+
 use SCST::SCST 0.9.10;
 use Getopt::Long;
 use IO::File;
 use IO::Dir;
 use POSIX;
-use strict;
 
 my $_DEF_CONFIG_ = '/etc/scst.conf';