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.

diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
index da3412459542082b17f4e220de2a674295c6c955..8e03af4ffcdefd3fc38ac935a444661aa6186c3c 100644 (file)
--- 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 3c886fcd4991f37255c4123b2b64f83b95c0f307..de50554e7e13c29efd1d80ebc39a6e140b0185d0 100644 (file)
--- 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 e7ac6d1afa065f8dc3046ca474badfdcd9817500..66c42557d4d30b6842b3c38043415d4ef376dea3 100755 (executable)
--- 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 a5e99dd0dea7fcb80c1bd0241c377af0870da992..2e396c0672687245f4c0815b24e987ad4dc5ce1b 100644 (file)
--- 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 c39178a93ca5bf97b093617ae8522455c5f1a414..f95f7a5c7abd5e9599512b039c6931cc91472acc 100644 (file)
--- 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);