Magellan Linux

Contents of /trunk/apache2/patches/apache2-2.2.4-apxs-httpd-config-2.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 242 - (show annotations) (download)
Sat Jul 7 17:05:10 2007 UTC (16 years, 9 months ago) by niro
File size: 823 byte(s)
better apxs patch:
 -fixes httpd.conf path and fixes module path relative to serverroot

1 diff -Naur httpd-2.2.4/support/apxs.in httpd-2.2.4-magellan/support/apxs.in
2 --- httpd-2.2.4/support/apxs.in 2006-07-12 05:38:44.000000000 +0200
3 +++ httpd-2.2.4-magellan/support/apxs.in 2007-07-07 19:03:31.000000000 +0200
4 @@ -31,11 +31,12 @@
5 # read the configuration variables once
6
7 my $prefix = get_vars("prefix");
8 -my $CFG_PREFIX = $prefix;
9 +my $libdir = get_vars("libdir");
10 +my $CFG_PREFIX = "$libdir/apache2";
11 my $exec_prefix = get_vars("exec_prefix");
12 my $datadir = get_vars("datadir");
13 my $localstatedir = get_vars("localstatedir");
14 -my $CFG_TARGET = get_vars("progname");
15 +my $CFG_TARGET = "httpd";
16 my $CFG_SYSCONFDIR = get_vars("sysconfdir");
17 my $CFG_CFLAGS = join ' ', map { get_vars($_) }
18 qw(SHLTCFLAGS CFLAGS NOTEST_CPPFLAGS EXTRA_CPPFLAGS EXTRA_CFLAGS);