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

Similar change to r483553 to help developers work in parallel on win32, install 

default command-line build to \Apache2x directory, and name service Apache2.x
(which means this doesn't need to change over and over as trunk becomes 2.5, 2.7 etc.)


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

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     \Apache23

#   PORT        80

#   SSLPORT     443

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



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

INSTDIR=\Apache2

INSTDIR=\Apache2x

!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.x"

#endif



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