summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dunstan2020-04-14 20:47:07 +0000
committerAndrew Dunstan2020-04-14 20:47:07 +0000
commite60c6f6ea17b50833242653fe2781f6d47429540 (patch)
tree940d2b839b4b95b68568788a17ca6b3a47050247
parent149f2ae88ab0510be3239caf45699d7373f2c6e8 (diff)
Set Perl search path more idiomatically
Back in commits 1df92eeafe, f884a96819, and 592123efbb I used some hackish code to set the script search path, unaware despite decades of perl that there was a completely standard way to do this. This patch changes those cases to use the standard perl FindBin package.
-rw-r--r--src/backend/catalog/genbki.pl5
-rw-r--r--src/tools/msvc/build.pl5
-rwxr-xr-xsrc/tools/msvc/install.pl5
-rw-r--r--src/tools/msvc/mkvcbuild.pl5
-rw-r--r--src/tools/msvc/vcregress.pl5
5 files changed, 11 insertions, 14 deletions
diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
index da34124595..8e03af4ffc 100644
--- a/src/backend/catalog/genbki.pl
+++ b/src/backend/catalog/genbki.pl
@@ -17,9 +17,8 @@ use strict;
use warnings;
use Getopt::Long;
-use File::Basename;
-use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+use FindBin;
+use lib $FindBin::RealBin;
use Catalog;
diff --git a/src/tools/msvc/build.pl b/src/tools/msvc/build.pl
index 3c886fcd49..de50554e7e 100644
--- a/src/tools/msvc/build.pl
+++ b/src/tools/msvc/build.pl
@@ -5,9 +5,8 @@
use strict;
use warnings;
-use File::Basename;
-use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+use FindBin;
+use lib $FindBin::RealBin;
use Cwd;
diff --git a/src/tools/msvc/install.pl b/src/tools/msvc/install.pl
index e7ac6d1afa..66c42557d4 100755
--- a/src/tools/msvc/install.pl
+++ b/src/tools/msvc/install.pl
@@ -6,9 +6,8 @@
use strict;
use warnings;
-use File::Basename;
-use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+use FindBin;
+use lib $FindBin::RealBin;
use Install qw(Install);
diff --git a/src/tools/msvc/mkvcbuild.pl b/src/tools/msvc/mkvcbuild.pl
index a5e99dd0de..2e396c0672 100644
--- a/src/tools/msvc/mkvcbuild.pl
+++ b/src/tools/msvc/mkvcbuild.pl
@@ -7,9 +7,8 @@
use strict;
use warnings;
-use File::Basename;
-use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+use FindBin;
+use lib $FindBin::RealBin;
use Mkvcbuild;
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index c39178a93c..f95f7a5c7a 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -12,8 +12,9 @@ use File::Basename;
use File::Copy;
use File::Find ();
use File::Path qw(rmtree);
-use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+
+use FindBin;
+use lib $FindBin::RealBin;
use Install qw(Install);