Author: torsten
Date: Mon Feb 20 13:15:25 2012
New Revision: 1291241
URL: http://svn.apache.org/viewvc?rev=1291241&view=rev
Log:
Merged revisions 1245946,1290839 via svnmerge from
https://svn.eu.apache.org/repos/asf/perl/modperl/trunk
........
r1245946 | torsten | 2012-02-18 16:38:49 +0100 (Sat, 18 Feb 2012) | 1 line
avoid hard-wired $(MAKE) options
........
r1290839 | torsten | 2012-02-18 19:31:38 +0100 (Sat, 18 Feb 2012) | 1 line
pass MP_APXS and MP_AP_PREFIX to submodule Makefile.PLs as environment
variables
........
Modified:
perl/modperl/branches/threading/ (props changed)
perl/modperl/branches/threading/Makefile.PL
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 20 13:15:25 2012
@@ -1 +1 @@
-/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073,985740,987933-1023553,1029211-1052232,1062311-1062448,1066644-1074122,1076733,1083541,1089349-1096565,1124132,1125476-1145161,1213838-1222775,1241435,1243923-1244184
+/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073,985740,987933-1023553,1029211-1052232,1062311-1062448,1066644-1074122,1076733,1083541,1089349-1096565,1124132,1125476-1145161,1213838-1222775,1241435,1243923-1244184,1245946-1290839
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb 20 13:15:25 2012
@@ -1 +1 @@
-/perl/modperl/trunk:1-712967,712969-1241872,1241874-1244192
+/perl/modperl/trunk:1-712967,712969-1241872,1241874-1291239
Modified: perl/modperl/branches/threading/Makefile.PL
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/Makefile.PL?rev=1291241&r1=1291240&r2=1291241&view=diff
==============================================================================
--- perl/modperl/branches/threading/Makefile.PL (original)
+++ perl/modperl/branches/threading/Makefile.PL Mon Feb 20 13:15:25 2012
@@ -241,6 +241,8 @@ EOI
}
}
+ $build->{$_} and $ENV{$_} = $build->{$_} for (qw/MP_APXS MP_AP_PREFIX/);
+
unless ($build->{MP_APXS} or $build->{MP_AP_PREFIX}) {
my $ok = 0;
for my $path ($build->find) {
@@ -789,24 +791,23 @@ run_tests : test_clean
$(PASSENV) \
$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
t/TEST -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES)
- $(MAKE) -k run_subtests
run_subtests ::
- $(MAKE) -C ModPerl-Registry test
+ cd ModPerl-Registry && $(MAKE) test
run_subtests ::
- $(MAKE) -C Apache-Reload test
+ cd Apache-Reload && $(MAKE) test
EOF
$preamble .= <<'EOF' unless $build->mpm_is_threaded();
run_subtests ::
- $(MAKE) -C Apache-SizeLimit test
+ cd Apache-SizeLimit && $(MAKE) test
EOF
$preamble .= <<'EOF';
-test :: pure_all run_tests test_clean
+test :: pure_all run_tests run_subtests
EOF
return $preamble;
