X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FScalar-Vec-Util.git;a=blobdiff_plain;f=Makefile.PL;h=533f27d7ec3f82665a3d000d300c2d1d84d40320;hp=3dbfaa29dffcb3fb0593fd8c480460f1b5c123a2;hb=67ef1b78ed684058b943a47d8c2c008718165a2e;hpb=6bd2911cc83d8c85647b93638da8577ee3bd3987 diff --git a/Makefile.PL b/Makefile.PL index 3dbfaa2..533f27d 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -7,33 +7,41 @@ use ExtUtils::MakeMaker; BEGIN { eval { require Config }; die 'OS unsupported' if $@; - Config->import(qw/%Config/); + Config->import(qw<%Config>); eval { require File::Spec }; die 'OS unsupported' if $@; } -# Inspired from Module::Install::Can -print "Checking for a valid C compiler in the PATH... "; -my @ccs = ($Config{cc}); -unshift @ccs, $ENV{CC} if $ENV{CC}; my $cc; +for (@ARGV) { + if (/^CC=(.*)/) { + $cc = $1; + last; + } +} +if (defined $cc) { + print "Forcing the use of $cc as the C compiler.\n"; +} else { + # Inspired from Module::Install::Can + print "Checking for a valid C compiler in the PATH... "; + my @ccs = ($Config{cc}); + unshift @ccs, $ENV{CC} if $ENV{CC}; CC: -for my $c (@ccs) { - for my $dir (split /$Config{path_sep}/, $ENV{PATH}) { - my $abs = File::Spec->catfile($dir, $c); - if (-x $abs or MM->maybe_command($abs)) { - $cc = $c; - last CC; + for my $c (@ccs) { + for my $dir (split /$Config{path_sep}/, $ENV{PATH}) { + my $abs = File::Spec->catfile($dir, $c); + if (-x $abs or MM->maybe_command($abs)) { + $cc = $c; + print $cc, "\n"; + last CC; + } } } + print "none\n" unless defined $cc; } + my @C; -if ($cc) { - push @C, 'Util.c'; - print $cc, "\n"; -} else { - print "none\n"; -} +push @C, 'Util.c' if defined $cc; my @DEFINES; @@ -117,14 +125,14 @@ WriteMakefile( C => \@C, @DEFINES, PREREQ_PM => \%PREREQ_PM, - MIN_PERL_VERSION => 5.006, + MIN_PERL_VERSION => '5.006', META_MERGE => \%META, dist => { - PREOP => "pod2text $file > \$(DISTVNAME)/README", + PREOP => "pod2text -u $file > \$(DISTVNAME)/README", COMPRESS => 'gzip -9f', SUFFIX => 'gz' }, clean => { - FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt" + FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt*" }, ); @@ -134,7 +142,7 @@ package MY; sub postamble { my $cv = join ' -coverage ', 'cover', - qw/statement branch condition path subroutine time/; + qw; <