Merge branch 'master' of git://git.pld-linux.org/packages/apache-mod_perl

[packages/apache-mod_perl.git] / apache-mod_perl-Makefile_PL.patch

diff --git a/apache-mod_perl-Makefile_PL.patch b/apache-mod_perl-Makefile_PL.patch
index d9e3f4aa385704e85349ee270b47c3744c507e98..926dcbfefc710b51ab5b1e29f23464bb03a2ab31 100644 (file)
--- a/apache-mod_perl-Makefile_PL.patch
+++ b/apache-mod_perl-Makefile_PL.patch
@@ -1,56 +1,30 @@
-diff -urN mod_perl-1.99_17_org/lib/Apache/Build.pm mod_perl-1.99_17/lib/Apache/Build.pm
---- mod_perl-1.99_17_org/lib/Apache/Build.pm   2004-09-26 09:06:23.000000000 +0200
-+++ mod_perl-1.99_17/lib/Apache/Build.pm       2004-11-09 18:41:20.043174376 +0100
-@@ -1499,16 +1499,16 @@
-     if (!$self->should_build_apache) {
-         $install .= <<'EOI';
- # install mod_perl.so
--      @$(MKPATH) $(MODPERL_AP_LIBEXECDIR)
-+      @$(MKPATH) $(DESTDIR)$(MODPERL_AP_LIBEXECDIR)
-       $(MODPERL_TEST_F) $(MODPERL_LIB_DSO) && \
--      $(MODPERL_CP) $(MODPERL_LIB_DSO) $(MODPERL_AP_LIBEXECDIR)
-+      $(MODPERL_CP) $(MODPERL_LIB_DSO) $(DESTDIR)$(MODPERL_AP_LIBEXECDIR)
- EOI
-     }
-     
-     $install .= <<'EOI';
- # install mod_perl .h files
--      @$(MKPATH) $(MODPERL_AP_INCLUDEDIR)
--      $(MODPERL_CP) $(MODPERL_H_FILES) $(MODPERL_AP_INCLUDEDIR)
-+      @$(MKPATH) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
-+      $(MODPERL_CP) $(MODPERL_H_FILES) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
- EOI
- 
-     my $mf = $self->default_file('makefile');
-diff -urN mod_perl-1.99_17_org/Makefile.PL mod_perl-1.99_17/Makefile.PL
---- mod_perl-1.99_17_org/Makefile.PL   2004-09-26 09:10:55.000000000 +0200
-+++ mod_perl-1.99_17/Makefile.PL       2004-11-09 18:07:29.142918144 +0100
-@@ -70,7 +70,7 @@
-     VERSION       => $VERSION,
+diff -Naur mod_perl-2.0.0-RC6.orig/Makefile.PL mod_perl-2.0.0-RC6/Makefile.PL
+--- mod_perl-2.0.0-RC6.orig/Makefile.PL        2005-05-26 13:01:39.000000000 +0200
++++ mod_perl-2.0.0-RC6/Makefile.PL     2005-05-26 13:01:48.000000000 +0200
+@@ -71,7 +71,7 @@
+     DISTNAME      => 'mod_perl',
      NO_META       => 1,
-     ABSTRACT_FROM => 'lib/mod_perl.pm',
+     ABSTRACT_FROM => 'lib/mod_perl2.pm',
 -    EXE_FILES     => \@exe_files,
 +#    EXE_FILES     => \@exe_files,
      DEFINE        => get_DEFINE(),
      macro         => {
-         MODPERL_SRC        => $code->path,
-@@ -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;
+         MODPERL_SRC           => $code->path,
+--- mod_perl-2.0.2/Makefile.PL 2005-12-29 20:58:08.000000000 +0200
++++ /tmp/mp    2005-12-29 20:52:31.000000000 +0200
+@@ -116,15 +116,6 @@
  
-@@ -591,8 +591,8 @@
-       cd "$(MODPERL_SRC)" && $(MAKE) install
+ sub configure {
  
- modperl_xs_h_install:
--      @$(MKPATH) $(MODPERL_AP_INCLUDEDIR)
--      $(CP) $(MODPERL_XS_H_FILES) $(MODPERL_AP_INCLUDEDIR)
-+      @$(MKPATH) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
-+      $(CP) $(MODPERL_XS_H_FILES) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
+-    # mod_perl test suite relies on having Apache-Test bundled with
+-    # the mod_perl source, since any pre-installed version may not do
+-    # the right thing
+-    unless (-d "Apache-Test") {
+-        error "Can't find a sub-directory Apache-Test. " .
+-            "Make sure that you are using a complete source distribution";
+-        exit 1;
+-    }
+-
+     set_modperl_version();
  
- modperl_src_clean:
-       cd "$(MODPERL_SRC)" && $(MAKE) clean
+     if ($old_modperl_version) {