apply non-conflicting parts from suggested patch

	Message-ID: <36223ed7.18279374@smtp1.ibm.net>
	Subject: [PATCH 5.005_52] Still more MakeMaker  patches

p4raw-id: //depot/perl@1991

diff --git a/lib/ExtUtils/MM_Win32.pm b/lib/ExtUtils/MM_Win32.pm
index cc85e87..4070b2e 100644 (file)
--- a/lib/ExtUtils/MM_Win32.pm
+++ b/lib/ExtUtils/MM_Win32.pm
@@ -473,7 +473,7 @@ sub perl_archive
 {
     my ($self) = @_;
     if($OBJ) {
-        if ($self->{CAPI} eq 'TRUE') {
+        if ($self->{CAPI}) {
             return '$(PERL_INC)\perlCAPI$(LIB_EXT)';
         }
     }

diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 7439e83..0482534 100644 (file)
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -1190,7 +1190,7 @@ architecture.  For example:
        perl Makefile.PL BINARY_LOCATION=x86/Agent.tar.gz
 
 builds a PPD package that references a binary of the C<Agent> package,
-located in the C<x86> directory.
+located in the C<x86> directory relative to the PPD itself.
 
 =item C
 
@@ -1594,7 +1594,7 @@ Defining PM in the Makefile.PL will override PMLIBDIRS.
 
 =item PPM_INSTALL_EXEC
 
-Name of the executable used to run C<PPM_INSTALL_SCRIPT> below.
+Name of the executable used to run C<PPM_INSTALL_SCRIPT> below. (e.g. perl)
 
 =item PPM_INSTALL_SCRIPT