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

Fix two flaws that make parallel testing of Apache2 (.0, .2, .x) very difficult, 

change the default dir for command-line make to \Apache22 on Windows, and change
the service name to Apache2.2 by default (this *matches* the windows installer.)

Resolves recent bug reports and confusion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483553 13f79535-47bb-0310-9956-ffa450edef68
parent 49d645c3

Makefile.win

+2 −2
Changes for Makefile.win: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
# The following install defaults may be customized;

#

#   Option      Default

#   INSTDIR     \Apache2

#   INSTDIR     \Apache22

#   PORT        80

#   SSLPORT     443

#   SERVERNAME  localhost
@@ -105,7 +105,7 @@ _tryzlib: 
!ENDIF



!IF "$(INSTDIR)" == ""

INSTDIR=\Apache2

INSTDIR=\Apache22

!ENDIF

!IF "$(SERVERNAME)" == ""

SERVERNAME=localhost

server/mpm/winnt/mpm_winnt.h

+1 −1
Changes for server/mpm/winnt/mpm_winnt.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#define SERVICE_APACHE_RESTART 128



#ifndef AP_DEFAULT_SERVICE_NAME

#define AP_DEFAULT_SERVICE_NAME "Apache2"

#define AP_DEFAULT_SERVICE_NAME "Apache2.2"

#endif



#define SERVICECONFIG9X "Software\\Microsoft\\Windows\\CurrentVersion\\RunServices"