Commit 2b9a3e13 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Fix two common overrides required for Win32

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

Makefile.win

+9 −0
Changes for Makefile.win: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#   Option      Default

#   INSTDIR     \Apache2

#   PORT        80

#   SSLPORT     443

#   SERVERNAME  localhost

#

# For example;
@@ -112,12 +113,18 @@ SERVERNAME=localhost 
!IF "$(PORT)" == ""

PORT=80

!ENDIF 

!IF "$(SSLPORT)" == ""

SSLPORT=443

!ENDIF 



!IF "$(LONG)" == ""

!MESSAGE

!MESSAGE INSTDIR    = $(INSTDIR)

!MESSAGE SERVERNAME = $(SERVERNAME)

!MESSAGE PORT       = $(PORT)

!IF EXIST("srclib\openssl")

!MESSAGE SSLPORT    = $(SSLPORT)

!ENDIF

!MESSAGE

!MESSAGE To change these options use 'nmake -f Makefile.win [option=value]'

!MESSAGE Example: nmake -f Makefile.win PORT=8080
@@ -741,6 +748,8 @@ BEGIN { 
    }

    {

	gsub( /@@ServerRoot@@/, serverroot );

	gsub( /443/, "$(SSLPORT)" );

	gsub( /SSLMutex  file:@exp_runtimedir@\/ssl_mutex/, "SSLMutex default" );

	gsub( /@exp_runtimedir@/, "logs" );

	gsub( /@exp_htdocsdir@/, serverroot "/htdocs" );

	gsub( /@exp_logfiledir@/, "logs" );