Author: stevehay
Date: Wed May 1 13:15:06 2013
New Revision: 1477980
URL: http://svn.apache.org/r1477980
Log:
Don't write an 'rpm' target into the Makefile on Windows. It isn't relevant on
Windows, and the (hard-coded, not MakeMaker-generated) recipe group has syntax
which dmake doesn't understand.
Using MinGW/+dmake to build mod_perl on Windows seems doomed to failure since
that would require a MinGW build of Apache too, which is not well supported at
best. However, this change means that any attempt to do so at least gets you
down to the real problem (it starts compiling the first source file and falls
over because a header file is missing), rather than choking on an invalid
Makefile.
It also allows for building with VC+dmake (rather than its native nmake), which
is an option supported by Perl and inherited by mod_perl via MakeMaker.
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/Makefile.PL
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=1477980&r1=1477979&r2=1477980&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Wed May 1 13:15:06 2013
@@ -12,6 +12,9 @@ Also refer to the Apache::Test changes l
=item 2.0.9-dev
+Don't write an 'rpm' target into the Makefile on Windows. It isn't relevant
+on Windows, and the (hard-coded, not MakeMaker-generated) recipe group has
+syntax which dmake doesn't understand. [Steve Hay]
=item 2.0.8 April 17, 2013
Modified: perl/modperl/trunk/Makefile.PL
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/Makefile.PL?rev=1477980&r1=1477979&r2=1477980&view=diff
==============================================================================
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Wed May 1 13:15:06 2013
@@ -821,7 +821,14 @@ sub MY::postamble {
my $string = $self->ModPerl::BuildMM::MY::postamble;
- $string .= <<'EOF';
+ if (WIN32) {
+ $string .= <<'EOF';
+mydist : Apache-Test/META.yml manifest tardist
+
+EOF
+ }
+ else {
+ $string .= <<'EOF';
mydist : Apache-Test/META.yml mod_perl.spec manifest tardist
rpm: dist
@@ -835,6 +842,10 @@ rpm: dist
mod_perl.spec: build/make_rpm_spec
$(PERL) build/make_rpm_spec
+EOF
+ }
+
+ $string .= <<'EOF';
Apache-Test/META.yml:
cd Apache-Test && make metafile
