Mailing List Archive

dougm 98/06/08 12:37:09

Modified: . Makefile.PL
Log:
make from APACHE_ROOT if $USE_APACI=1
thanks to hint from Ralf

Revision Changes Path
1.40 +8 -1 modperl/Makefile.PL

Index: Makefile.PL
===================================================================
RCS file: /export/home/cvs/modperl/Makefile.PL,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Makefile.PL 1998/06/08 01:40:15 1.39
+++ Makefile.PL 1998/06/08 19:37:08 1.40
@@ -896,6 +896,7 @@
#CCDLFLAGS => "$Config{ccdlflags} $EXTRA_CFLAGS",
DEFINE => $EXTRA_CFLAGS,
macro => {
+ APACHE_ROOT => $APACHE_ROOT,
APACHE_SRC => $APACHE_SRC,
ARCHNAME => $Config{archname},
PERL_VERSION => $]+0,
@@ -945,7 +946,10 @@
my $string = $self->MM::top_targets;
return $string unless $USE_APXS or $APACHE_SRC;

- if($APACHE_SRC) {
+ if($USE_APACI) {
+ $string =~ s/(pure_all\s+::\s+)(.*)/$1 apaci_httpd $2/;
+ }
+ elsif($APACHE_SRC) {
return $string unless -f "$APACHE_SRC/$Configuration";
my $asrc = asrc($APACHE_SRC, "http_main.c");
if(-e "$asrc/http_main.c" and !$NO_HTTPD) {
@@ -965,6 +969,9 @@

apache_httpd: $(APACHE_SRC)/Makefile.tmpl
(cd $(APACHE_SRC) && $(MAKE) CC="$(CC)";)
+
+apaci_httpd:
+ (cd $(APACHE_ROOT) && $(MAKE) CC="$(CC)";)

tar_Apache:
(cd $(INSTALLSITELIB); \