Integrate macperl patch #16868.

p4raw-id: //depot/perl@16882
p4raw-integrated: from //depot/macperl@16881 'copy in'
	ext/B/B/Concise.pm ext/B/t/deparse.t ext/B/t/terse.t
	ext/DynaLoader/DynaLoader_pm.PL ext/IO/lib/IO/t/io_dup.t
	ext/POSIX/t/sigaction.t ext/PerlIO/t/encoding.t
	ext/Socket/Socket.t lib/AutoSplit.t
	lib/Net/Ping/t/110_icmp_inst.t lib/Net/hostent.t
	lib/Pod/t/Usage.t lib/Pod/t/pod2html-lib.pl
	lib/Test/Harness/t/callback.t lib/blib.pm lib/strict.t
	lib/subs.t t/lib/filter-util.pl t/lib/warnings/doio
	t/lib/warnings/mg t/x2p/s2p.t (@16123..)
	lib/Test/Simple/t/exit.t (@16230..) lib/open.t lib/warnings.t
	(@16255..) perl.c (@16475..) lib/Unicode/Collate.pm
	lib/Unicode/UCD.t (@16651..) ext/PerlIO/t/fallback.t
	lib/Test/Harness/t/strap-analyze.t
	lib/Test/Harness/t/test-harness.t (@16825..)
p4raw-integrated: from //depot/macperl@16868 'copy in' lib/blib.t
	(@16123..) t/lib/warnings/op (@16230..) ext/Cwd/t/cwd.t
	ext/Digest/MD5/t/files.t (@16475..) 'merge in'
	ext/Storable/t/utf8hash.t lib/Test/Harness/Straps.pm (@16730..)

2 files changed, 5 insertions, 2 deletions

diff --git a/lib/Unicode/Collate.pm b/lib/Unicode/Collate.pm
index 676a3aadfe..51c290ec87 100644
--- a/lib/Unicode/Collate.pm
+++ b/lib/Unicode/Collate.pm
@@ -10,6 +10,7 @@ use 5.006;
 use strict;
 use warnings;
 use Carp;
+use File::Spec;
 
 require Exporter;
 
@@ -151,8 +152,9 @@ sub read_table {
     my $self = shift;
     my $file = $self->{table} ne '' ? $self->{table} : $KeyFile;
 
-    open my $fk, "<$Path/$file"
-	or croak "File does not exist at $Path/$file";
+    my $filepath = File::Spec->catfile($Path, $file);
+    open my $fk, "<$filepath"
+	or croak "File does not exist at $filepath";
 
     while (<$fk>) {
 	next if /^\s*#/;
diff --git a/lib/Unicode/UCD.t b/lib/Unicode/UCD.t
index 0e1550e289..9082057bbd 100644
--- a/lib/Unicode/UCD.t
+++ b/lib/Unicode/UCD.t
@@ -5,6 +5,7 @@ BEGIN {
     }
     chdir 't' if -d 't';
     @INC = '../lib';
+    @INC = "::lib" if $^O eq 'MacOS'; # module parses @INC itself
 }
 
 use strict;