From 94777a048d45e18979595b9280247fa7a45b234c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Salvador=20Fandi=C3=B1o?= <sfandino@yahoo.com>
Date: Thu, 30 Mar 2017 12:27:13 +0200
Subject: [PATCH] Handle @INC without . in it for PDL build - Take 2

---
 Basic/Core/Core.xs        | 2 +-
 Basic/Core/pdl.h.PL       | 2 +-
 Basic/Core/pdlconv.c.PL   | 4 ++--
 Basic/Core/pdlcore.c.PL   | 4 ++--
 Basic/Core/pdlcore.h.PL   | 4 ++--
 Basic/Core/pdlsimple.h.PL | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Basic/Core/Core.xs b/Basic/Core/Core.xs
index 5e95356a4..b38f14cee 100644
--- a/Basic/Core/Core.xs
+++ b/Basic/Core/Core.xs
@@ -336,7 +336,7 @@ iscontig(x)
 
 # using "perl" not $^X because that doesn't work on "perl in space"
 # TODO: switching back to $^X since using "perl" is not a viable fix
-INCLUDE_COMMAND: $^X -e "require q{Dev.pm}; PDL::Core::Dev::generate_core_flags()"
+INCLUDE_COMMAND: $^X -e "require q{./Dev.pm}; PDL::Core::Dev::generate_core_flags()"
 
 #if 0
 =begin windows_mmap
diff --git a/Basic/Core/pdl.h.PL b/Basic/Core/pdl.h.PL
index d2e9758f0..6e01445f1 100644
--- a/Basic/Core/pdl.h.PL
+++ b/Basic/Core/pdl.h.PL
@@ -6,7 +6,7 @@ use Config;
 use File::Basename qw(&basename &dirname);
 
 # how many variable types (ie PDL_Byte, ...) are there?
-require 'Types.pm';
+require './Types.pm';
 my $ntypes = $#PDL::Types::names;
 my $PDL_DATATYPES = PDL::Types::datatypes_header();
 
diff --git a/Basic/Core/pdlconv.c.PL b/Basic/Core/pdlconv.c.PL
index 160e29b32..62a57b05a 100644
--- a/Basic/Core/pdlconv.c.PL
+++ b/Basic/Core/pdlconv.c.PL
@@ -7,9 +7,9 @@ use strict;
 use Config;
 use File::Basename qw(&basename &dirname);
  
-require 'Dev.pm'; PDL::Core::Dev->import;
+require './Dev.pm'; PDL::Core::Dev->import;
 use vars qw( %PDL_DATATYPES );
-require 'Types.pm'; #for typesrtkeys
+require './Types.pm'; #for typesrtkeys
 
 # This forces PL files to create target in same directory as PL file.
 # This is so that make depend always knows where to find PL derivatives.
diff --git a/Basic/Core/pdlcore.c.PL b/Basic/Core/pdlcore.c.PL
index a602b6e93..445cfb861 100644
--- a/Basic/Core/pdlcore.c.PL
+++ b/Basic/Core/pdlcore.c.PL
@@ -6,7 +6,7 @@ use strict;
 use Config;
 use File::Basename qw(&basename &dirname);
 
-require 'Dev.pm'; PDL::Core::Dev->import;
+require './Dev.pm'; PDL::Core::Dev->import;
 use vars qw( %PDL_DATATYPES );
 
 # check for bad value support
@@ -14,7 +14,7 @@ require './Config.pm'; # to load the PDL not the Perl one
 die "No PDL::Config found" unless %PDL::Config;
 my $bvalflag = $PDL::Config{WITH_BADVAL};
 my $usenan = $PDL::Config{BADVAL_USENAN};
-require 'Types.pm';
+require './Types.pm';
 PDL::Types->import(':All');
 
 
diff --git a/Basic/Core/pdlcore.h.PL b/Basic/Core/pdlcore.h.PL
index 90469f03d..760e6a12f 100644
--- a/Basic/Core/pdlcore.h.PL
+++ b/Basic/Core/pdlcore.h.PL
@@ -11,7 +11,7 @@ use strict;
 use Config;
 use File::Basename qw(&basename &dirname);
 
-require 'Dev.pm'; PDL::Core::Dev->import;
+require './Dev.pm'; PDL::Core::Dev->import;
 use vars qw( %PDL_DATATYPES );
 
 # version 2 is for versions after PDL 2.1.1
@@ -349,7 +349,7 @@ double NaN_double;
 
     # fortunately it looks like Types.pm.PL is processed before this
     # file
-    require "Types.pm";  # ie PDL::Types
+    require "./Types.pm";  # ie PDL::Types
 
 for (PDL::Types::typesrtkeys()) {
    my $ctype = $PDL::Types::typehash{$_}{ctype};
diff --git a/Basic/Core/pdlsimple.h.PL b/Basic/Core/pdlsimple.h.PL
index e5119136a..43eb557c5 100644
--- a/Basic/Core/pdlsimple.h.PL
+++ b/Basic/Core/pdlsimple.h.PL
@@ -3,7 +3,7 @@
 use Config;
 use File::Basename qw(&basename &dirname);
 
-require 'Types.pm';
+require './Types.pm';
 my $PDL_DATATYPES = PDL::Types::datatypes_header();
 
 # List explicitly here the variables you want Configure to