set a default port.

configurable via INSTPORT


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

1 files changed, 12 insertions, 1 deletions

diff --git a/Makefile.win b/Makefile.win
index 4283a87c4e..8187c45490 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -13,8 +13,13 @@
 # The default installation directory is \Apache2.0. This can be changed
 # with the INSTDIR macro, for example:
 #
+#
 #   nmake /f Makefile.win INSTDIR="d:\Program Files\Apache" installr
 #
+# The default install port is 80. This can be changed by the with the
+# INSTPORT macro, for example:
+#   nmake /f Makefile.win INSTPORT=80 INSTDIR="d:\Program Files\Apache" installr
+#
 # Note: this does *NOT* change the compiled in default "server root"
 # Also be aware that certain awk's will not accept backslahed names,
 # so the server root should be given in forward slashes (quoted),
@@ -72,6 +77,10 @@ _tryssl:
 INSTDIR=\Apache2
 !MESSAGE Using default install directory $(INSTDIR)
 !ENDIF 
+!IF "$(INSTPORT)" == ""
+INSTPORT=80
+!MESSAGE Using default install port $(INSTPORT)
+!ENDIF 
 
 !IFNDEF MAKEOPT
 # Only default the behavior if MAKEOPT= is omitted
@@ -499,14 +508,16 @@ _install:
 	if not exist "$(INSTDIR)\conf\mime.types" \
 	    copy "$(INSTDIR)\conf\mime.types.default" "$(INSTDIR)\conf\mime.types"
 	copy docs\conf\httpd-win.conf "$(INSTDIR)\conf\httpd.default.conf"
-	-awk -f <<script.awk "docs\conf\httpd-win.conf" "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)"
+	-awk -f <<script.awk "docs\conf\httpd-win.conf" "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)" "$(INSTPORT)"
     BEGIN { 
 	srcfl = ARGV[1];
 	dstfl = ARGV[2];
 	serverroot = ARGV[3];
+	serverport = ARGV[4];
 	gsub( /\\/, "/", serverroot );
 	while ( ( getline < srcfl ) > 0 ) {
 	    gsub( /@@ServerRoot@@/, serverroot );
+	    gsub( /@@Port@@/, serverport );
 	    print $$0 > dstfl;
 	}
     }