diff options
| author | Ilya Zakharevich <ilya@math.berkeley.edu> | 2006-12-17 16:45:24 -0800 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2006-12-18 13:34:00 +0000 |
| commit | 9d419b5f6925ac8219b490513f2c0e4f2d7c7f74 (patch) | |
| tree | ade0148247a1332511a5db94e9ff95d8b80c9b4b /lib | |
| parent | dbf3bb275a8c67f06df1e6e24df320e3d78b2d60 (diff) | |
| download | perl-9d419b5f6925ac8219b490513f2c0e4f2d7c7f74.tar.gz | |
OS/2-specific fixes, round II
Message-ID: <20061218084524.GA14866@powdermilk.math.berkeley.edu>
p4raw-id: //depot/perl@29580
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ExtUtils/MM_Unix.pm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm index d5f93a579f..da0d57d82c 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -2538,7 +2538,7 @@ doc_inst_perl: MAP_LIBPERL "$(MAP_LIBPERL)" \ >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ -}; +} if -f 'Makefile.PL'; push @m, q{ inst_perl: pure_inst_perl doc_inst_perl @@ -3415,6 +3415,7 @@ sub test { } # note: 'test.pl' name is also hardcoded in init_dirscan() my(@m); + my $subdirs_test = ($self->{DIR} && @{$self->{DIR}} ? 'subdirs-test' : ''); push(@m," TEST_VERBOSE=0 TEST_TYPE=test_\$(LINKTYPE) @@ -3424,17 +3425,17 @@ TESTDB_SW = -d testdb :: testdb_\$(LINKTYPE) -test :: \$(TEST_TYPE) +test :: \$(TEST_TYPE) $subdirs_test "); foreach my $dir (@{ $self->{DIR} }) { my $test = $self->oneliner(sprintf <<'CODE', $dir); chdir '%s'; -system '$(MAKE) test $(PASTHRU)' +system '$(MAKE) $(USEMAKEFILE) $(FIRST_MAKEFILE) test $(PASTHRU)' if -f '$(FIRST_MAKEFILE)'; CODE - push(@m, "\t\$(NOECHO) $test\n"); + push(@m, "\nsubdirs-test ::\n\t\$(NOECHO) $test\n"); } push(@m, "\t\$(NOECHO) \$(ECHO) 'No tests defined for \$(NAME) extension.'\n") |