Use define for serverroot with NetWare conf files.

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

diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk
index a9be017cd0bbfaf03d9d0c1a4db6777d155627f3..c0028cef0c7c42581c26648241ff183216b9b86d 100644 (file)
--- 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 "