- updated to 2.0.13

[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 07a20b83fb40a438831c157f308fa52ef50f7d2d..926dcbfefc710b51ab5b1e29f23464bb03a2ab31 100644 (file)
--- a/apache-mod_perl-Makefile_PL.patch
+++ b/apache-mod_perl-Makefile_PL.patch
@@ -1,41 +1,30 @@
---- Makefile.PL.orig   Thu Jul 17 22:03:27 2003
-+++ Makefile.PL        Thu Jul 17 23:05:06 2003
-@@ -73,7 +73,7 @@
- ModPerl::BuildMM::WriteMakefile(
-     NAME      => 'mod_perl',
-     VERSION   => $VERSION,
--    EXE_FILES => \@exe_files,
-+#   EXE_FILES => \@exe_files,
-     macro     => {
-         MODPERL_SRC        => $code->path,
-         MODPERL_MAKEFILE   => basename($build->default_file('makefile')),
-@@ -419,8 +419,8 @@
-       cd "$(MODPERL_SRC)" && $(MODPERL_LIBMAKE) install
+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_perl2.pm',
+-    EXE_FILES     => \@exe_files,
++#    EXE_FILES     => \@exe_files,
+     DEFINE        => get_DEFINE(),
+     macro         => {
+         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 @@
  
- 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)
+ sub configure {
  
- modperl_src_clean:
-       cd "$(MODPERL_SRC)" && $(MODPERL_LIBMAKE) clean
---- lib/Apache/Build.pm~       Thu Jul 17 22:03:40 2003
-+++ lib/Apache/Build.pm        Thu Jul 17 23:15:12 2003
-@@ -1190,12 +1190,12 @@
- 
- install:
- # install mod_perl.so
--      @$(MKPATH) $(MODPERL_AP_LIBEXECDIR)
-+      @$(MKPATH) $(MODPERL_AP_LIBEXECDIR)
-       $(MODPERL_TEST_F) $(MODPERL_LIB_DSO) && \
--      $(MODPERL_CP) $(MODPERL_LIB_DSO) $(MODPERL_AP_LIBEXECDIR)
-+      $(MODPERL_CP) $(MODPERL_LIB_DSO) $(MODPERL_AP_LIBEXECDIR)
- # 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)
- 
- .SUFFIXES: .xs .c $(MODPERL_OBJ_EXT) .lo .i .s
+-    # 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();
  
+     if ($old_modperl_version) {