1 diff -urNp -x '*.orig' httpd-2.4.46.org/support/apxs.in httpd-2.4.46/support/apxs.in
2 --- httpd-2.4.46.org/support/apxs.in 2020-03-20 14:00:44.000000000 +0100
3 +++ httpd-2.4.46/support/apxs.in 2021-06-16 09:20:17.513003551 +0200
4 @@ -45,6 +45,7 @@ my $CFG_PREFIX = $prefix;
5 my $exec_prefix = get_vars("exec_prefix");
6 my $datadir = get_vars("datadir");
7 my $localstatedir = get_vars("localstatedir");
8 +my $libdir = get_vars("libdir");
9 my $CFG_TARGET = get_vars("progname");
10 my $CFG_SYSCONFDIR = get_vars("sysconfdir");
11 my $CFG_CFLAGS = join ' ', map { get_vars($_) }
12 @@ -56,6 +57,7 @@ my $CFG_INCLUDEDIR = eval qq("$includedi
13 my $CFG_CC = get_vars("CC");
14 my $libexecdir = $destdir . get_vars("libexecdir");
15 my $CFG_LIBEXECDIR = eval qq("$libexecdir");
16 +my $CFG_DESTDIR = '';
17 my $sbindir = get_vars("sbindir");
18 my $CFG_SBINDIR = eval qq("$sbindir");
19 my $ltflags = $ENV{'LTFLAGS'};
20 @@ -183,7 +185,7 @@ if (@opt_S) {
22 my $oldval = eval "\$CFG_$var";
24 - unless ($var and $oldval) {
25 + unless ($var and defined $oldval) {
26 print STDERR "apxs:Error: no config variable $var\n";
29 @@ -512,8 +514,8 @@ if ($opt_i or $opt_e) {
30 $t =~ s|\.[^./\\]+$|\.so|;
32 push(@cmds, $destdir . "$installbuilddir/instdso.sh SH_LIBTOOL='" .
33 - "$libtool' $f $CFG_LIBEXECDIR");
34 - push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
35 + "$libtool' $f $CFG_DESTDIR$CFG_LIBEXECDIR");
36 + push(@cmds, "chmod 755 $CFG_DESTDIR$CFG_LIBEXECDIR/$t");
39 # determine module symbolname and filename