blob: 394f337bc4e970d145731a019dfed30c70c6cbb2 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
--- Makefile.PL~ Fri Jan 22 11:57:51 1999
+++ Makefile.PL Sun May 9 19:41:55 1999
@@ -67,12 +67,10 @@
sleep(1);
}
-%Apache::MyConfig::Setup = ();
-eval 'require Apache::MyConfig' ;
-
-$APACHE_SRC_DEFAULT = $@ ?
- '../apache_x.x/src' :
- $Apache::MyConfig::Setup{Apache_Src} ;
+opendir( WRKDIR, "$ENV{APACHEDIR}" ) || die( "Can't open $ENV{APACHEDIR}: $!\n" );
+( $srcdir ) = grep( /^apache/, readdir( WRKDIR ) );
+closedir( WRKDIR );
+$APACHE_SRC_DEFAULT = "$ENV{APACHEDIR}" . $srcdir . "/src";
my $PWD = cwd;
@@ -157,12 +155,12 @@
}
$PORT ||= $Port;
$TARGET = "";
-$DO_HTTPD = $ENV{DO_HTTPD} || 0;
+$DO_HTTPD = 1;
$NO_HTTPD = $ENV{NO_HTTPD} || 0;
$PREP_HTTPD = 0;
$PERL_TRACE = 0;
$ALL_HOOKS = 0;
-$APACHE_SRC = "";
+$APACHE_SRC = $APACHE_SRC_DEFAULT;
$APACHE_PREFIX = "";
$APACHE_HEADER_INSTALL = 1;
$PERL_SECTIONS = 0;
@@ -1570,8 +1568,8 @@
my $repl = "";
my @file = ();
my $ccopts = ccopts();
- my $dssv = "-DSERVER_SUBVERSION";
- my $ssv = qq($dssv=\\"mod_perl/$VERSION\\" );
+ my $dssv = "\n-DSERVER_SUBVERSION";
+ my $ssv = qq($dssv=\\"mod_perl/$VERSION\\" \\);
my $inc = " $ccopts -I. -I../.. -DUSE_PERL_SSI" if $PERL_SSI;
$inc .= " -DAPACHE_SSL" if is_ssl() and $PERL_SSI;
|
