stas 2003/03/23 00:11:09
Modified: . Makefile.PL
Log:
we no longer need to do the trick with docs/api/mod_perl-2.0 outreaching
in Makefile.PL, since now the pods get glued to their pm files
Revision Changes Path
1.98 +0 -29 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- Makefile.PL 22 Mar 2003 07:36:57 -0000 1.97
+++ Makefile.PL 23 Mar 2003 08:11:09 -0000 1.98
@@ -48,15 +48,6 @@
my $build = Apache::Build->new(init => 1);
my $code = ModPerl::Code->new;
-#XXX: dunno why but win32 fails because of this:
-#cd docs/api/mod_perl-2.0 && nmake all ...
-#NMAKE : fatal error U1073: don't know how to make 'all'
-#Stop.
-#NMAKE : fatal error U1077: 'cd' : return code '0x2'
-#Stop.
-my @remote_makefile_dirs = WIN32() ? () :
- qw(docs/api/mod_perl-2.0);
-
configure();
local %ModPerl::BuildMM::PM = (
@@ -72,7 +63,6 @@
ModPerl::BuildMM::WriteMakefile(
NAME => 'mod_perl',
VERSION => $VERSION,
- DIR => get_dirs_with_makefile(@remote_makefile_dirs),
macro => {
MODPERL_SRC => $code->path,
MODPERL_MAKEFILE => basename($build->default_file('makefile')),
@@ -377,25 +367,6 @@
EOF
}
}
-}
-
-# by default only Makefile.PL's in the first level sub-dirs are
-# discovered. If you want to reach a Makefile.PL's in some remote
-# directories, pass them to this function.
-sub get_dirs_with_makefile {
- my @remove_makefile_dirs = @_;
- my %mf_dirs = ();
-
- # since we cannot override MM::init_dirscan, but at the same time
- # want to change $self->{DIR}, we have to reproduce
- # MM::init_dirscan's section on setting DIR
- for my $dir (@remote_makefile_dirs,
- grep {-d} DirHandle->new(curdir())->read) {
- next if curdir() eq $dir || updir() eq $dir;
- next if -l $dir; # no symlinks per MakeMaker
- $mf_dirs{$dir}++ if -f catfile($dir, "Makefile.PL");
- }
- return [sort keys %mf_dirs];
}
package MY;
