|
|
f0c688 |
|
|
|
f0c688 |
Use libdir from configuration.
|
|
|
f0c688 |
|
|
|
f0c688 |
--- httpd-2.4.18/support/apxs.in.apxs
|
|
|
f0c688 |
+++ httpd-2.4.18/support/apxs.in
|
|
|
f0c688 |
@@ -35,6 +35,7 @@ my $CFG_PREFIX = $prefix;
|
|
|
f0c688 |
my $exec_prefix = get_vars("exec_prefix");
|
|
|
f0c688 |
my $datadir = get_vars("datadir");
|
|
|
f0c688 |
my $localstatedir = get_vars("localstatedir");
|
|
|
f0c688 |
+my $libdir = get_vars("libdir");
|
|
|
f0c688 |
my $CFG_TARGET = get_vars("progname");
|
|
|
f0c688 |
my $CFG_SYSCONFDIR = get_vars("sysconfdir");
|
|
|
f0c688 |
my $CFG_CFLAGS = join ' ', map { get_vars($_) }
|
|
|
f0c688 |
@@ -275,7 +276,7 @@ if ($opt_g) {
|
|
|
af9b8b |
$data =~ s|%NAME%|$name|sg;
|
|
|
af9b8b |
$data =~ s|%TARGET%|$CFG_TARGET|sg;
|
|
|
af9b8b |
$data =~ s|%PREFIX%|$prefix|sg;
|
|
|
af9b8b |
- $data =~ s|%INSTALLBUILDDIR%|$installbuilddir|sg;
|
|
|
af9b8b |
+ $data =~ s|%LIBDIR%|$libdir|sg;
|
|
|
af9b8b |
|
|
|
af9b8b |
my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s);
|
|
|
af9b8b |
|
|
|
f0c688 |
@@ -453,11 +454,11 @@ if ($opt_c) {
|
|
|
af9b8b |
my $ldflags = "$CFG_LDFLAGS";
|
|
|
af9b8b |
if ($opt_p == 1) {
|
|
|
af9b8b |
|
|
|
af9b8b |
- my $apr_libs=`$apr_config --cflags --ldflags --link-libtool --libs`;
|
|
|
af9b8b |
+ my $apr_libs=`$apr_config --cflags --ldflags --link-libtool`;
|
|
|
af9b8b |
chomp($apr_libs);
|
|
|
af9b8b |
my $apu_libs="";
|
|
|
af9b8b |
if ($apr_major_version < 2) {
|
|
|
af9b8b |
- $apu_libs=`$apu_config --ldflags --link-libtool --libs`;
|
|
|
af9b8b |
+ $apu_libs=`$apu_config --ldflags --link-libtool`;
|
|
|
af9b8b |
chomp($apu_libs);
|
|
|
af9b8b |
}
|
|
|
af9b8b |
|
|
|
f0c688 |
@@ -672,8 +673,8 @@ __DATA__
|
|
|
af9b8b |
|
|
|
af9b8b |
builddir=.
|
|
|
af9b8b |
top_srcdir=%PREFIX%
|
|
|
af9b8b |
-top_builddir=%PREFIX%
|
|
|
af9b8b |
-include %INSTALLBUILDDIR%/special.mk
|
|
|
af9b8b |
+top_builddir=%LIBDIR%/httpd
|
|
|
af9b8b |
+include %LIBDIR%/httpd/build/special.mk
|
|
|
af9b8b |
|
|
|
af9b8b |
# the used tools
|
|
|
33b929 |
APACHECTL=apachectl
|