1 --- apache_1.3.34/src/support/apxs.pl 2006-04-13 11:33:42.264267119 +0300
2 +++ /usr/sbin/apxs1 2006-04-12 18:43:04.710095895 +0300
4 my $CFG_INCLUDEDIR = q(@includedir@); # substituted via APACI install
5 my $CFG_LIBEXECDIR = q(@libexecdir@); # substituted via APACI install
6 my $CFG_SYSCONFDIR = q(@sysconfdir@); # substituted via APACI install
10 ## Cleanup the above stuff
12 if ($opt_S =~ m/^([^=]+)=(.*)$/) {
13 my ($var, $val) = ($1, $2);
14 my $oldval = eval "\$CFG_$var";
15 - unless ($var and $oldval) {
16 + unless ($var and defined($oldval)) {
17 print STDERR "apxs:Error: no config variable $var\n";
23 TARGET CC CFLAGS CFLAGS_SHLIB LD_SHLIB LDFLAGS_SHLIB LIBS_SHLIB
24 - PREFIX SBINDIR INCLUDEDIR LIBEXECDIR SYSCONFDIR
25 + PREFIX SBINDIR INCLUDEDIR LIBEXECDIR SYSCONFDIR DESTDIR
27 if ($arg eq $name or $arg eq lc($name)) {
28 my $val = eval "\$CFG_$name";
30 if ($^O ne "MSWin32") {
31 $t =~ s|^.+/([^/]+)$|$1|;
33 - push(@cmds, "cp -f $f $CFG_LIBEXECDIR/$t");
34 - push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
35 + push(@cmds, "cp -f $f $CFG_DESTDIR$CFG_LIBEXECDIR/$t");
36 + push(@cmds, "chmod 755 $CFG_DESTDIR$CFG_LIBEXECDIR/$t");
40 $t =~ s|^.+[/\\]([^/\\]+)$|$1|;
42 - push(@cmds, "copy \"$f\" \"$CFG_LIBEXECDIR/$t\"");
43 + push(@cmds, "copy \"$f\" \"$CFG_DESTDIR$CFG_LIBEXECDIR/$t\"");