You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2013/03/02 20:46:36 UTC
svn commit: r1451928 - /httpd/httpd/branches/2.4.x/build/mkconfNW.awk
Author: fuankg
Date: Sat Mar 2 19:46:36 2013
New Revision: 1451928
URL: http://svn.apache.org/r1451928
Log:
Use define for serverroot with NetWare conf files.
(Backport r1451155)
Modified:
httpd/httpd/branches/2.4.x/build/mkconfNW.awk
Modified: httpd/httpd/branches/2.4.x/build/mkconfNW.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/mkconfNW.awk?rev=1451928&r1=1451927&r2=1451928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/mkconfNW.awk (original)
+++ httpd/httpd/branches/2.4.x/build/mkconfNW.awk Sat Mar 2 19:46:36 2013
@@ -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 "