Fix Carp::Heavy bugs

git-svn-id: svn://axkit.org/XML-Parser/trunk@22 2154792d-645b-41ca-96ca-efebb8c93226
chorny · Sep 13, 2010 · 2931971 · 2931971
1 parent 29c7340
commit 2931971
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 22 deletions.
diff --git a/Expat/Makefile.PL b/Expat/Makefile.PL
@@ -3,30 +3,27 @@ use Config;
 use English;
 
 my $libs = "-lexpat";
-@extras = ();
+my @extras = ();
 
-push(@extras, INC => "-I$expat_incpath")
+push(@extras, INC => "-I$expat_incpath") if $expat_incpath;
-  if $expat_incpath;
 
-$libs = "-L$expat_libpath $libs"
+$libs = "-L$expat_libpath $libs" if $expat_libpath;
-  if $expat_libpath;
+
-
+push(@extras, CAPI => 'TRUE')
-push(@extras,
+    if (($PERL_VERSION >= 5.005) and ($OSNAME eq 'MSWin32')
-     CAPI => 'TRUE')
+        and ($Config{archname} =~ /-object\b/i));
-    if ($PERL_VERSION >= 5.005 and $OSNAME eq 'MSWin32'
-	and $Config{archname} =~ /-object\b/i);
 
 push(@extras,
-     ABSTRACT => "Lowlevel access to James Clark's expat XML parser",
+    ABSTRACT => "Lowlevel access to James Clark's expat XML parser",
-     AUTHOR        => 'Clark Cooper (coopercc@netheaven.com)')
+    AUTHOR   => 'Matt Sergeant (matt@sergeant.org)')
-    if ($ExtUtils::MakeMaker::VERSION >= 5.4301);
+  if ($ExtUtils::MakeMaker::VERSION >= 5.4301);
-     
+
 WriteMakefile(
-              NAME	=> 'XML::Parser::Expat',
+    NAME	=> 'XML::Parser::Expat',
-	      C         => ['Expat.c'],
+    C         => ['Expat.c'],
-	      LIBS	=> $libs,
+    LIBS	=> $libs,
-              XSPROTOARG => '-noprototypes',
+    XSPROTOARG => '-noprototypes',
-              VERSION_FROM => 'Expat.pm',
+    VERSION_FROM => 'Expat.pm',
-	      @extras
+    @extras
-             );
+);
 
diff --git a/Makefile.PL b/Makefile.PL
@@ -85,7 +85,7 @@ sub MY::test
   $ret;
 }
 
-@extras = ();
+my @extras = ();
 
 push(@extras,
      CAPI => 'TRUE')