Merge the only thing on trunk that isn't already in httpd24threading into httpd24threading ahead of merging everything back to trunk. This is purely for the sake of my sanity...
git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/branches/httpd24threading@1602081 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build/make_rpm_spec b/build/make_rpm_spec
index db08172..b932f33 100755
--- a/build/make_rpm_spec
+++ b/build/make_rpm_spec
@@ -16,7 +16,7 @@
print $spec <<"EOF";
%define _version $mod_perl2::VERSION_TRIPLET
%define _release $release
-%define _source http://perl.apache.org/dist/$tarname
+%define _source http://apache.org/dist/perl/$tarname
%define _dirname $path
%define _httpd_min_ver $httpd_ver
%define _perl_min_ver 5.6.1
diff --git a/build/win32_fetch_apxs b/build/win32_fetch_apxs
index bbebaab..4dd3dc3 100755
--- a/build/win32_fetch_apxs
+++ b/build/win32_fetch_apxs
@@ -49,7 +49,7 @@
- install apxs by answering "yes" at the prompt below,
- quit now, run the "fetch_win32_apxs.pl" script in the build/ directory
to fetch and install the utilities, and then rebuild mod_perl,
-- quit now, and from http://perl.apache.org/dist/win32-bin/ grab
+- quit now, and from http://apache.org/dist/perl/win32-bin/ grab
apxs_win32.tar.gz; when unpacked, this contains a README explaining
how to install the utilities. Afterwards, rebuild mod_perl.
----------------------------------------------------------------------
@@ -72,7 +72,7 @@
my $file = 'apxs_win32.tar.gz';
unless (-e $file) {
- my $remote = 'http://perl.apache.org/dist/win32-bin/' . $file;
+ my $remote = 'http://apache.org/dist/perl/win32-bin/' . $file;
print "Fetching $remote ... ";
die "Download of $remote failed"
unless (is_success(getstore($remote, $file)));
