summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenter Knauf <fuankg@apache.org>2013-03-02 19:46:36 +0000
committerGuenter Knauf <fuankg@apache.org>2013-03-02 19:46:36 +0000
commitd7db9dd78c0647263d7d432cbf402a0e77e91038 (patch)
tree462caef66e0c16e6324da403dd8b65604788e909
parentd724826a692ceb6754fd3462bf8057c288378f59 (diff)
downloadhttpd-d7db9dd78c0647263d7d432cbf402a0e77e91038.tar.gz
Use define for serverroot with NetWare conf files.
(Backport r1451155) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1451928 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--build/mkconfNW.awk9
1 files changed, 6 insertions, 3 deletions
diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk
index a9be017cd0..c0028cef0c 100644
--- a/build/mkconfNW.awk
+++ b/build/mkconfNW.awk
@@ -14,8 +14,7 @@
# limitations under the License.
BEGIN {
-
- A["ServerRoot"] = "SYS:/"BDIR
+ A["ServerRoot"] = "\${SRVROOT}"
A["Port"] = PORT
A["SSLPort"] = SSLPORT
A["cgidir"] = "cgi-bin"
@@ -39,6 +38,10 @@ BEGIN {
B["runtimedir"] = A["runtimedir"]
}
+/^ServerRoot / {
+ print "Define SRVROOT \"SYS:/" BDIR "\""
+ print ""
+}
/@@LoadModule@@/ {
print "#LoadModule access_compat_module modules/accesscompat.nlm"
print "#LoadModule actions_module modules/actions.nlm"
@@ -143,7 +146,7 @@ match ($0,/^<IfModule cgid_module>$/) {
}
END {
- if ((ARGV[1] ~ /httpd.conf.in/) && !BSDSKT) {
+ if ((ARGV[1] ~ /httpd.conf.in/) && !BSDSKT) {
print ""
print "#"
print "# SecureListen: Allows you to securely bind Apache to specific IP addresses "