From: Joe Orton <jorton@apache.org>
Date: Wed, 2 Nov 2005 12:59:59 +0000 (+0000)
Subject: * build/config_vars.sh.in: Prepend DESTDIR to paths to installed
X-Git-Tag: 2.3.0~2807
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81a4bc28d120329cceba63afa2651b8a2b88925c;p=thirdparty%2Fapache%2Fhttpd.git

* 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 dca2194cfe8..babc003af1d 100644
--- 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 9c002f71b44..7b3d6177f02 100644
--- 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`"