3 files changed, 16 insertions, 9 deletions

diff --git a/www/libapreq2/files/patch-glue-Makefile.in b/www/libapreq2/files/patch-glue-Makefile.in
new file mode 100644
index 000000000000..c70dab377129
--- /dev/null
+++ b/www/libapreq2/files/patch-glue-Makefile.in
@@ -0,0 +1,11 @@
+--- glue/Makefile.in.orig	Mon May 29 19:31:01 2006
++++ glue/Makefile.in	Mon May 29 19:31:12 2006
+@@ -262,7 +262,7 @@
+ 	cd perl; $(MAKE) test
+ 
+ perl_install:
+-	cd perl; $(MAKE) install
++	cd perl; $(MAKE) pure_install
+ 
+ perl_clean:
+ 	-cd perl; $(MAKE) clean
diff --git a/www/libapreq2/files/patch-glue-perl-Makefile.PL b/www/libapreq2/files/patch-glue-perl-Makefile.PL
index 452b081b44a9..f8515fd7ec69 100644
--- a/www/libapreq2/files/patch-glue-perl-Makefile.PL
+++ b/www/libapreq2/files/patch-glue-perl-Makefile.PL
@@ -6,7 +6,7 @@
      'TYPEMAPS'  => [qw(@$mp2_typemaps $typemap)],
 -    'INC'       => "-I$base_dir/glue/perl/xs -I$inc_dir -I$xs_dir $apache_includes",
 -    'LIBS'      => "$apreq_libs $apr_libs",
-+    'INC'       => "-I$base_dir/glue/perl/xs -I$inc_dir -I$xs_dir $apache_includes -I\\\$(PREFIX)/include/apache2/modules/perl",
++    'INC'       => "-I$base_dir/glue/perl/xs -I$inc_dir -I$xs_dir $apache_includes -I\\\$(PREFIX)/%%APACHEINCLUDEDIR%%/modules/perl",
 +    'LIBS'      => "$apreq_libs $apr_libs -L\\\$(PREFIX)/lib",
  } ;
  $txt .= "'depend'  => $deps,\n" if ($deps) ;
diff --git a/www/libapreq2/files/patch-library-Makefile.in b/www/libapreq2/files/patch-library-Makefile.in
index f6efd93c0d77..f4a38fc16897 100644
--- a/www/libapreq2/files/patch-library-Makefile.in
+++ b/www/libapreq2/files/patch-library-Makefile.in
@@ -1,11 +1,7 @@
---- library/Makefile.in.orig	Sat May 21 17:21:51 2005
-+++ library/Makefile.in	Sat May 21 17:22:18 2005
-@@ -137,10 +137,10 @@
- libapreq2_la_OBJECTS = $(am_libapreq2_la_OBJECTS)
- 
- DEFS = @DEFS@
--DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
-+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(prefix)/include/apache2/modules/perl
+--- library/Makefile.in.orig	Sat Feb 11 18:57:28 2006
++++ library/Makefile.in	Mon May 29 19:13:23 2006
+@@ -141,7 +141,7 @@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@