From: Rich Bowen <rbowen@apache.org>
Date: Mon, 22 Oct 2012 23:42:24 +0000 (+0000)
Subject: Define the document root once, and then use the variable elsewhere, so
X-Git-Tag: 2.5.0-alpha~6181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c53e59d56c22baf2798d142811d3940972e698d6;p=thirdparty%2Fapache%2Fhttpd.git

Define the document root once, and then use the variable elsewhere, so
that if it gets changed one place it inherits it everywhere. Also, a
practical example of `Define` in action.


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

diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
index 43425f8203f..7a0138552db 100644
--- a/docs/conf/httpd.conf.in
+++ b/docs/conf/httpd.conf.in
@@ -129,8 +129,10 @@ ServerAdmin you@example.com
 # documents. By default, all requests are taken from this directory, but
 # symbolic links and aliases may be used to point to other locations.
 #
-DocumentRoot "@exp_htdocsdir@"
-<Directory "@exp_htdocsdir@">
+
+Define DOCROOT "@exp_htdocsdir@"
+DocumentRoot "${DOCROOT"}
+<Directory "${DOCROOT}">
     #
     # Possible values for the Options directive are "None", "All",
     # or any combination of: