Author: stas
Date: Mon May 9 13:38:47 2005
New Revision: 169355
URL: http://svn.apache.org/viewcvs?rev=169355&view=rev
Log:
Fix a warning triggered by `ln` on Cygwin, when running perl
Makefile.PL for a second time without previously running make
clean.
Contributed by: Nick *** <[EMAIL PROTECTED]>
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/lib/Apache2/Build.pm
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=169355&r1=169354&r2=169355&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Mon May 9 13:38:47 2005
@@ -12,6 +12,10 @@
=item 1.999_24-dev
+Fix a warning triggered by `ln` on Cygwin, when running perl
+Makefile.PL for a second time without previously running make
+clean. [Nick *** <[EMAIL PROTECTED]>]
+
When compiling a static mod_perl and
MP_AP_CONFIGURE="--with-apr=/some/path" argument is given, Apache will
use the apr-config at the given path, but mod_perl was using the
Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=169355&r1=169354&r2=169355&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Mon May 9 13:38:47 2005
@@ -1586,7 +1586,7 @@
# 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";
- qx{ln -s $src $dst};
+ qx{ln -s $src $dst} unless -e $dst;
qx{cp $dyna_filepath $modperl_path/libDynaLoader.a};
$modperl_static_libs_cygwin = join ' ',
