* build/config_vars.sh.in: Prepend DESTDIR to paths to installed

apr/apu-config scripts.

Submitted by: Torsten Foertsch <torsten.foertsch gmx.net>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@330246 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index dca2194cfe89f2e96e8d28a637aa52eea467df4e..babc003af1d719b9a022dc7c1bcf8ed518f14d6b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) Fix DESTDIR=... installation when using bundled copy of APR.
+     [Torsten Foertsch <torsten.foertsch gmx.net>]
+
   *) mod_proxy_balancer: When finding best worker, use case insensitive
      match for scheme and host, but case sensitive for the rest of
      the path. [Jim Jagielski, Ruediger Pluem]

diff --git a/build/config_vars.sh.in b/build/config_vars.sh.in
index 9c002f71b4432afaf94ed5e375488337d91b59e0..7b3d6177f02869df1918ea3dd8cfc0113ba39ffa 100644 (file)
--- a/build/config_vars.sh.in
+++ b/build/config_vars.sh.in
@@ -21,8 +21,8 @@
 # installed.  Such a file cannot be generated at configure-time, since it
 # requires the output of the *installed* ap*-config scripts.
 
-APR_CONFIG=@APR_CONFIG@
-APU_CONFIG=@APU_CONFIG@
+APR_CONFIG=${DESTDIR}@APR_CONFIG@
+APU_CONFIG=${DESTDIR}@APU_CONFIG@
 
 APR_LIBTOOL="`${APR_CONFIG} --apr-libtool`"
 APR_INCLUDEDIR="`${APR_CONFIG} --includedir`"