Index: openssl-1.0.1s/util/mk1mf.pl
===================================================================
--- openssl-1.0.1s.orig/util/mk1mf.pl	2016-03-01 08:40:03.000000000 -0500
+++ openssl-1.0.1s/util/mk1mf.pl	2016-03-21 13:02:01.430333947 -0400
@@ -156,7 +156,7 @@
 $tmp_def="tmp";
 
 $perl="perl" unless defined $perl;
-$mkdir="-mkdir" unless defined $mkdir;
+$mkdir="-mkdir -p" unless defined $mkdir;
 
 ($ssl,$crypto)=("ssl","crypto");
 $ranlib="echo ranlib";
Index: openssl-1.0.1s/util/mkdir-p.pl
===================================================================
--- openssl-1.0.1s.orig/util/mkdir-p.pl	2015-01-15 09:43:14.000000000 -0500
+++ openssl-1.0.1s/util/mkdir-p.pl	2016-03-21 13:02:01.430333947 -0400
@@ -29,6 +29,10 @@
     do_mkdir_p($parent);
   }
 
-  mkdir($dir, 0777) || die "Cannot create directory $dir: $!\n";
+  # Only die if the directory wasn't created between when we last checked
+  # and when we attempted to create it.
+  if (!mkdir($dir, 0777)) {
+    die "Cannot create directory $dir: $!\n" unless -d $dir;
+  }
   print "created directory `$dir'\n";
 }