1 --- httpd-2.0.50/support/apxs.in.orig 2004-07-25 21:25:37.955097000 +0000
2 +++ httpd-2.0.50/support/apxs.in 2004-07-25 22:25:01.093725664 +0000
4 ($httpd = $0) =~ s:support/apxs$::;
7 -unless (-x "$httpd") {
8 - error("$httpd not found or not executable");
10 +if (not -x "$httpd") {
11 + print STDERR "Note: $httpd not found or not executable.\n";
15 unless (grep /mod_so/, `. $envvars && $httpd -l`) {
16 error("Sorry, no shared object support for Apache");
17 error("available under your platform. Make sure");
19 error("your server binary `$httpd'.");
25 my ($file, $rh_config) = @_;
27 --- httpd-2.2.0/support/apxs.in 2005-12-27 00:22:41.000000000 +0200
28 +++ /usr/sbin/apxs 2005-12-28 16:06:45.000000000 +0200
30 my $CFG_CC = get_vars("CC");
31 my $libexecdir = get_vars("libexecdir");
32 my $CFG_LIBEXECDIR = eval qq("$libexecdir");
33 +my $DESTDIR = $ENV{'DESTDIR'};
34 my $sbindir = get_vars("sbindir");
35 my $CFG_SBINDIR = eval qq("$sbindir");
36 my $ltflags = $ENV{'LTFLAGS'};
38 $t =~ s|\.[^./\\]+$|\.so|;
40 push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
41 - "$libtool' $f $CFG_LIBEXECDIR");
42 - push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
43 + "$libtool' $f $DESTDIR$CFG_LIBEXECDIR");
44 + push(@cmds, "chmod 755 $DESTDIR$CFG_LIBEXECDIR/$t");
47 # determine module symbolname and filename