Cleanup Makefile.PL

diff --git a/perl/ChangeLog b/perl/ChangeLog
index 081137d..63d6a38 100644 (file)
--- a/perl/ChangeLog
+++ b/perl/ChangeLog
@@ -1,3 +1,5 @@
+   o Clean up Makefile.PL
+
 Version 0.71_03 --  28 Apr 2011 <bobtfish@bobtfish.net>
    o Remove support for sfio which is an optional (and not enabled by default)
      compile option to perl that is never used.

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index 380e5f8..6aa5301 100644 (file)
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -5,6 +5,7 @@ use IO::File;
 use Config;
 use Cwd 'cwd';
 use Getopt::Long;
+use File::Copy qw(copy);
 
 @h1 = qw(fastcgi.h fcgiapp.h fcgimisc.h fcgios.h);
 @h = (@h1, 'fcgi_config.h');
@@ -14,7 +15,7 @@ use Getopt::Long;
 @dist3 = (@h1, qw(fcgi_config_x86.h));
 
 GetOptions ("pure-perl!" => \$pure,
-           "use-installed:s" => \$useinstalled);
+        "use-installed:s" => \$useinstalled);
 $pure = "0" unless defined $pure;
 open(CFG,">FCGI.cfg");
 print CFG "\$pure = $pure;1;\n";
@@ -28,34 +29,34 @@ if (! $pure) {
     my $devkit = "$cwd/..";
 
     if (defined $useinstalled) {
-       require ExtUtils::Liblist;
-       my $libspec = $useinstalled ? "-L$useinstalled/lib " : "";
-       $libspec .= "-lfcgi";
-       my @l = MM->ext($libspec);
-       if ($l[0] || $l[1] || $l[2]) {
-           $prefix = "$useinstalled/include" if $useinstalled;
-           $libfound = 1;
-           push @libs, $libspec;
-       }
+    require ExtUtils::Liblist;
+    my $libspec = $useinstalled ? "-L$useinstalled/lib " : "";
+    $libspec .= "-lfcgi";
+    my @l = MM->ext($libspec);
+    if ($l[0] || $l[1] || $l[2]) {
+        $prefix = "$useinstalled/include" if $useinstalled;
+        $libfound = 1;
+        push @libs, $libspec;
+    }
     }
     if (!$libfound && -d "$devkit/libfcgi" && -d "$devkit/include") {
-       # devkit
-       if (grep { ! -f "$devkit/include/$_" } @dist3 
-               or grep { ! -f "$devkit/libfcgi/$_" } @dist2)
-       {
-               warn "This appears to be a FastCGI devkit distribution, " .
-                    "but one or more FastCGI library files are missing. \n" .
-                    "Please check the integrity of the distribution.\n";
-               exit -1;
-       }
-
-       my $extrarules = join "\n", 
-           map { $b = $_; $b =~ s/\.c$//; my $s="$devkit/libfcgi/$b.c"; 
-                 "$b\$(OBJ_EXT): $s\n\t".
-                 '$(CCCMD) $(CCCDLFLAGS) -I$(PERL_INC) $(DEFINE) '."$s\n"; }
-               @dist2;
-       eval 'package MY; sub postamble { $extrarules; }';
-       $prefix = $devkit;
+        # devkit
+        if (grep { ! -f "$devkit/include/$_" } @dist3 
+            or grep { ! -f "$devkit/libfcgi/$_" } @dist2)
+        {
+            warn "This appears to be a FastCGI devkit distribution, " .
+                "but one or more FastCGI library files are missing. \n" .
+                "Please check the integrity of the distribution.\n";
+            exit -1;
+        }
+
+        my $extrarules = join "\n",
+            map { $b = $_; $b =~ s/\.c$//; my $s="$devkit/libfcgi/$b.c";
+                "$b\$(OBJ_EXT): $s\n\t".
+                '$(CCCMD) $(CCCDLFLAGS) -I$(PERL_INC) $(DEFINE) '."$s\n"; }
+                @dist2;
+        eval 'package MY; sub postamble { $extrarules; }';
+        $prefix = $devkit;
     }
 }
 
@@ -70,58 +71,61 @@ push(@extras, CAPI => 'TRUE')
 
 push(@extras,
     ABSTRACT => 'Fast CGI module',
-    AUTHOR   => 'Sven Verdoolaege (skimo@kotnet.org)')
-        if ($ExtUtils::MakeMaker::VERSION >= 5.4301); 
-
-$plfiles = { 'echo.PL' => 'echo.fpl', 
-            'remote.PL' => 'remote.fpl',
-            'threaded.PL' => 'threaded.fpl',
-            'FCGI.PL' => 'FCGI.pm',
-          };
+    AUTHOR   => 'Sven Verdoolaege (skimo@kotnet.org)'
+)
+    if ($ExtUtils::MakeMaker::VERSION >= 5.4301);
+
+$plfiles = {
+    'echo.PL' => 'echo.fpl',
+    'remote.PL' => 'remote.fpl',
+    'threaded.PL' => 'threaded.fpl',
+    'FCGI.PL' => 'FCGI.pm',
+};
 $plfiles->{'FCGI.XL'} = 'FCGI.xs' unless $pure;
 if ($pure) {
     push @extras,
-       LINKTYPE => ' ';
+    LINKTYPE => ' ';
 } else {
 
-       if ("$sys" eq "win32") {
-               push @libs, ":nosearch -lws2_32";
-               push @extras, 'DEFINE' => '-DDLLAPI=__declspec(dllexport)';
-       }
+    if ("$sys" eq "win32") {
+        push @libs, ":nosearch -lws2_32";
+        push @extras, 'DEFINE' => '-DDLLAPI=__declspec(dllexport)';
+    }
 
     push @extras,
-       'LIBS'  => [ "@libs" ],
-       'OBJECT'        => "@o",
-       'INC'   => $inc;
+        'LIBS'    => [ "@libs" ],
+        'OBJECT'    => "@o",
+        'INC'    => $inc;
 }
-        
+
 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
 # the contents of the Makefile that is written.
 
 # Work around bug in previous versions of MakeMaker
-WriteMakefile(NAME => 'FCGI') 
+WriteMakefile(NAME => 'FCGI')
     if $ExtUtils::MakeMaker::VERSION <= 5.4302;
 
 $mm = MM->new({
-    'NAME'             => 'FCGI',
-    'VERSION_FROM'     => 'version.pm',
-    'dist'             => { 'COMPRESS' => 'gzip -9f', 
-                            'SUFFIX' => 'gz',
-                            'PREOP' => '$(CP) '.join(' ',
-                               map {"../$_"} @dist1,
-                               (map {"libfcgi/$_"} @dist2),
-                               map {"include/$_"} @dist3).' $(DISTVNAME);'.
-                               '$(CP) MANIFEST MANIFEST.old;'.
-                               'echo -e '. join('\\\n',@dist1,@dist2,@dist3) .
-                               '>> $(DISTVNAME)/MANIFEST',
-                             'POSTOP' => 
-                               '$(MV) MANIFEST.old MANIFEST',
-                           },
-    'clean'            => { FILES => 'config.cache fcgi_config.h' . 
-                                     ' FCGI.xs FCGI.c FCGI.cfg ' .
-                                     (join ' ', values %$plfiles)},
-    'PL_FILES'         => $plfiles,
-    PM                 => {'FCGI.pm' => '$(INST_ARCHLIBDIR)/FCGI.pm'},
+    'NAME'        => 'FCGI',
+    'VERSION_FROM'    => 'version.pm',
+    'dist' => {
+        'COMPRESS' => 'gzip -9f',
+        'SUFFIX' => 'gz',
+        'PREOP' => '$(CP) '.join(' ',
+            map {"../$_"} @dist1,
+            (map {"libfcgi/$_"} @dist2),
+            map {"include/$_"} @dist3).' $(DISTVNAME);'.
+                '$(CP) MANIFEST MANIFEST.old;'.
+                'echo -e '. join('\\\n',@dist1,@dist2,@dist3) .
+                '>> $(DISTVNAME)/MANIFEST',
+                  'POSTOP' => 
+                '$(MV) MANIFEST.old MANIFEST',
+    },
+    'clean'        => { FILES => 'config.cache fcgi_config.h' .
+                      ' FCGI.xs FCGI.c FCGI.cfg ' .
+                      (join ' ', values %$plfiles)},
+    'PL_FILES'        => $plfiles,
+    PM            => {'FCGI.pm' => '$(INST_ARCHLIBDIR)/FCGI.pm'},
     @extras,
 });
 # don't install oldinterface pod
@@ -135,7 +139,6 @@ if ($sys eq "win32") {
     # configure will almost certainly not run on a normal NT install,
     # use the pregenerated configuration file
 
-    use File::Copy qw(copy);
     print "Using prebuilt fcgi_config.h file for Windows\n";
     unlink("fcgi_config.h");
     my $confdir = $prefix ? "$prefix/include/" : '';
@@ -154,3 +157,4 @@ if ($sys eq "win32") {
     $ENV{'CC'} = $Config{'cc'};
     system("$Config{sh} configure");
 }
+