From:	jhorwitz@cvs.perl.org	Date:	Tue Sep 23 11:39:39 2008
Subject:	[svn:mod_parrot] r450 - mod_parrot/trunk

Author: jhorwitz
Date: Tue Sep 23 10:39:38 2008
New Revision: 450

Modified:
   mod_parrot/trunk/Configure.pl
   mod_parrot/trunk/Makefile.in

Log:
fix confusion with apache/apr/apr-util include dirs


Modified: mod_parrot/trunk/Configure.pl
==============================================================================
--- mod_parrot/trunk/Configure.pl	(original)
+++ mod_parrot/trunk/Configure.pl	Tue Sep 23 10:39:38 2008
@@ -102,8 +102,8 @@
 $template =~ s/\@PARROT_BLIB_DIR\@/$parrot_build_dir\/$blib_dir/g;
 $template =~ s/\@PARROT\@/$parrot_build_dir\/parrot/g;
 $template =~ s/\@APACHE_INCLUDE_DIR\@/$apache_include_dir/g;
-$template =~ s/\@APR_INCLUDE_DIR\@/$apache_include_dir/g;
-$template =~ s/\@APU_INCLUDE_DIR\@/$apache_include_dir/g;
+$template =~ s/\@APR_INCLUDE_DIR\@/$apr_include_dir/g;
+$template =~ s/\@APU_INCLUDE_DIR\@/$apu_include_dir/g;
 $template =~ s/\@CALLING_CONVENTIONS\@/$calling_conventions/g;
 open(MAKEFILE, ">Makefile") or die $!;
 print MAKEFILE $template;

Modified: mod_parrot/trunk/Makefile.in
==============================================================================
--- mod_parrot/trunk/Makefile.in	(original)
+++ mod_parrot/trunk/Makefile.in	Tue Sep 23 10:39:38 2008
@@ -56,7 +56,7 @@
 all: gen-src $(SRC_DIR)/mod_parrot.la
 
 %.lo: %.c
-	$(LIBTOOL) --mode=compile $(CC) -o $@ $(EXTRA_CPPFLAGS) $(DEBUG) $(CFLAGS) -I$(CFG_INCLUDEDIR) -I$(APR_INCLUDE_DIR) -I$(APU_INCLUDE_DIR) $(DEFINES) -c $<
+	$(LIBTOOL) --mode=compile $(CC) -o $@ $(EXTRA_CPPFLAGS) $(DEBUG) $(CFLAGS) -I$(APACHE_INCLUDE_DIR) -I$(APR_INCLUDE_DIR) -I$(APU_INCLUDE_DIR) $(DEFINES) -c $<
 
 $(SRC_DIR)/mod_parrot.la: $(OBJ_FILES)
 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(OBJ_FILES) $(LIBS) -rpath $(LIBEXECDIR) -module -avoid-version