You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by ra...@apache.org on 2005/03/03 03:51:11 UTC
svn commit: r156001 -
httpd/apreq/branches/multi-env-unstable/glue/perl/Makefile.PL
Author: randyk
Date: Wed Mar 2 18:51:10 2005
New Revision: 156001
URL: http://svn.apache.org/viewcvs?view=rev&rev=156001
Log:
for Win32, introduce workaround to arrange to have the
modules under lib/ in the perl glue installed under an
Apache2/ subdirectory.
Modified:
httpd/apreq/branches/multi-env-unstable/glue/perl/Makefile.PL
Modified: httpd/apreq/branches/multi-env-unstable/glue/perl/Makefile.PL
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/glue/perl/Makefile.PL?view=diff&r1=156000&r2=156001
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/glue/perl/Makefile.PL (original)
+++ httpd/apreq/branches/multi-env-unstable/glue/perl/Makefile.PL Wed Mar 2 18:51:10 2005
@@ -139,6 +139,7 @@
package My::WrapXS;
use base qw/ExtUtils::XSBuilder::WrapXS/;
our $VERSION = $version;
+use constant WIN32 => ($^O =~ /Win32/i);
##################################################
# Finally, we get to the actual script...
@@ -159,12 +160,23 @@
Apache::TestSmokePerl->generate_script;
Apache::TestReportPerl->generate_script;
-ModPerl::MM::WriteMakefile(
+my %opts = (
NAME => 'libapreq2',
DIR => [qw(xs)],
clean => { FILES => "xs t/logs t/TEST @scripts" },
realclean => { FILES => "xsbuilder/tables" },
);
+
+if (WIN32) {
+ my $PM = {
+ 'lib/Apache/Request.pm' => '$(INST_LIB)/Apache/Request.pm',
+ 'lib/Apache/Upload.pm' => '$(INST_LIB)/Apache/Upload.pm',
+ 'lib/Apache/Cookie.pm' => '$(INST_LIB)/Apache/Cookie.pm',
+ };
+ $opts{PM} = $PM;
+}
+
+ModPerl::MM::WriteMakefile(%opts);
# That's the whole script - below is just a bunch of local overrides
##################################################