From ee5444e12cfbb9c5696143faaa46f5980a5ae987 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Fri, 13 Sep 2013 00:01:21 +0000 Subject: [PATCH] works with (Strawberry) Perl 5.010 from 2009, so require that version; move to older File::Path interface git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1522747 13f79535-47bb-0310-9956-ffa450edef68 --- README.cmake | 2 -- build/cpR_noreplace.pl | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.cmake b/README.cmake index d5233ea890..09a4d038cd 100644 --- a/README.cmake +++ b/README.cmake @@ -278,8 +278,6 @@ Known Bugs and Limitations * no support for static support library builds; unclear if that is a requirement; if so: taking PCRE as an example, we'd need to detect that it is static and then turn on PCRE_STATIC for the libhttpd build -* build/cpR_noreplace.pl doesn't declare what version of Perl is required - and doesn't work with File::Path that is missing make_path Generally: diff --git a/build/cpR_noreplace.pl b/build/cpR_noreplace.pl index 03f904ba52..054f572e36 100644 --- a/build/cpR_noreplace.pl +++ b/build/cpR_noreplace.pl @@ -19,7 +19,9 @@ use strict; use File::Basename; use File::Copy; use File::Find; -use File::Path qw(make_path); +use File::Path qw(mkpath); + +require 5.010; my $srcdir; my $destdir; @@ -42,7 +44,7 @@ sub process_file { # Create it. my $dir = dirname($destfile); if (! -e $dir) { - make_path($dir) or die "Failed to create directory $dir: $!"; + mkpath($dir) or die "Failed to create directory $dir: $!"; } copy($File::Find::name, $destfile) or die "Copy $File::Find::name->$destfile failed: $!"; }