From d7ce6d3bed362a1dd2cc232485f89bba47361cbb Mon Sep 17 00:00:00 2001
From: "H.Merijn Brand" <h.m.brand@xs4all.nl>
Date: Mon, 2 Sep 2013 11:40:41 +0200
Subject: [PATCH] Search for errno.h in more (semi)default locations

---
 ext/Errno/Errno_pm.PL | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
index bb41e03..c2c84b6 100644
--- a/ext/Errno/Errno_pm.PL
+++ b/ext/Errno/Errno_pm.PL
@@ -133,8 +133,10 @@ sub get_files {
 	     ) {
 	# Some Linuxes have weird errno.hs which generate
 	# no #file or #line directives
-	my $linux_errno_h = -e '/usr/include/errno.h' ?
-	    '/usr/include/errno.h' : '/usr/local/include/errno.h';
+	my ($linux_errno_h) = grep { -e $_ } map { "$_/errno.h" }
+	    "/usr/include", "/usr/local/include",
+	    split / / => $Config{locincpth} or
+		die "Cannot find errno.h";
 	$file{$linux_errno_h} = 1;
     } elsif ($^O eq 'haiku') {
 	# hidden in a special place
@@ -252,8 +254,8 @@ sub write_errno_pm {
 		$err{$name} = hex $expr;
 	    }
 	    else {
-	    $err{$name} = eval $expr;
-	}
+		$err{$name} = eval $expr;
+	    }
 	    delete $err{$name} unless defined $err{$name};
 	}
 	close(CPPO);
@@ -261,7 +263,7 @@ sub write_errno_pm {
 
     # escape $Config{'archname'}
     my $archname = $Config{'archname'};
-    $archname =~ s/([@%\$])/\\\1/g;
+    $archname =~ s/([@%\$])/\\$1/g;
 
     # Write Errno.pm
 
-- 
2.7.4