- updated for 2.0.0-RC1

Changed files:
    apache-mod_perl-Makefile_PL.patch -> 1.7

diff --git a/apache-mod_perl-Makefile_PL.patch b/apache-mod_perl-Makefile_PL.patch
index d0ce8701efa12fe2bf205dabdc956a617f613b69..d9e3f4aa385704e85349ee270b47c3744c507e98 100644 (file)
--- a/apache-mod_perl-Makefile_PL.patch
+++ b/apache-mod_perl-Makefile_PL.patch
@@ -34,15 +34,15 @@ diff -urN mod_perl-1.99_17_org/Makefile.PL mod_perl-1.99_17/Makefile.PL
      DEFINE        => get_DEFINE(),
      macro         => {
          MODPERL_SRC        => $code->path,
-@@ -150,7 +150,7 @@
-                 error "cannot install mod_perl/$VERSION on top of $vstring",
-                     "use MP_INST_APACHE2=1 option " .
-                      "or to force installation delete:\n $old_modperl_pm";
--                exit 1;
-+#                exit 1;
-             }
+@@ -132,7 +132,7 @@
+         if ($build->{MP_INST_APACHE2}) {
+             print "ok (installing relative to Apache2/)\n";
          }
-     }
+-        else {
++        elsif (0) {
+             my $prefix;
+             /^PREFIX=(.*)/ && $1 && ($prefix = canonpath glob($1)) for @ARGV;
+ 
 @@ -591,8 +591,8 @@
        cd "$(MODPERL_SRC)" && $(MAKE) install