Author: stevehay
Date: Wed May 1 13:33:36 2013
New Revision: 1477995
URL: http://svn.apache.org/r1477995
Log:
Fix the build with VC++ and dmake (rather than nmake) on Windows. The Makefile
generated by Apache2::Build uses shell commands for the manifest file, but
neglected to tell dmake to use the shell.
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/lib/Apache2/Build.pm
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=1477995&r1=1477994&r2=1477995&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Wed May 1 13:33:36 2013
@@ -12,6 +12,10 @@ Also refer to the Apache::Test changes l
=item 2.0.9-dev
+Fix the build with VC++ and dmake (rather than nmake) on Windows. The
+Makefile generated by Apache2::Build uses shell commands for the manifest
+file, but neglected to tell dmake to use the shell. [Steve Hay]
+
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]
Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/Build.pm?rev=1477995&r1=1477994&r2=1477995&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Wed May 1 13:33:36 2013
@@ -75,6 +75,7 @@ use constant OPENBSD => $^O eq 'openbsd'
use constant WIN32 => $^O eq 'MSWin32';
use constant MSVC => WIN32() && ($Config{cc} eq 'cl');
+use constant DMAKE => WIN32() && ($Config{make} eq 'dmake');
use constant REQUIRE_ITHREADS => grep { $^O eq $_ } qw(MSWin32);
use constant PERL_HAS_ITHREADS =>
@@ -1979,6 +1980,11 @@ EOF
print $fh $install;
+ print $fh <<'EOF' if DMAKE;
+
+.USESHELL :
+EOF
+
print $fh <<'EOF';
.SUFFIXES: .xs .c $(MODPERL_OBJ_EXT) .lo .i .s
