Author: stas
Date: Tue May 10 21:36:39 2005
New Revision: 169578
URL: http://svn.apache.org/viewcvs?rev=169578&view=rev
Log:
use File::Copy instead of calling an external shell
Contributed by Nick *** <[EMAIL PROTECTED]>
Modified:
perl/modperl/trunk/lib/Apache2/Build.pm
Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=169578&r1=169577&r2=169578&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Tue May 10 21:36:39 2005
@@ -24,6 +24,7 @@
catpath splitpath);
use File::Basename;
use ExtUtils::Embed ();
+use File::Copy ();
use constant IS_MOD_PERL_BUILD => grep { -e "$_/lib/mod_perl2.pm" } qw(. ..);
@@ -1590,8 +1591,12 @@
# when running make clean the real DynaLoader.a may get deleted.
my $src = catfile $modperl_path, "$self->{MP_LIBNAME}.a";
my $dst = catfile $modperl_path, "lib$self->{MP_LIBNAME}.a";
+ # perl's link() on Cygwin seems to copy mod_perl.a to
+ # libmod_perl.a, but at this stage mod_perl.a is still a dummy lib
+ # and at the end we get nothing. whereas `ln -s` seems to create
+ # something like the shortcut on windows and it works.
qx{ln -s $src $dst} unless -e $dst;
- qx{cp $dyna_filepath $modperl_path/libDynaLoader.a};
+ File::Copy::copy($dyna_filepath, "$modperl_path/libDynaLoader.a");
$modperl_static_libs_cygwin = join ' ',
"-L$modperl_path",
