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

diff --git a/Makefile.win b/Makefile.win
index 9bf43205f1438e64938c85aa72d5334e95180d48..cfa125d84951f27bd81e55a28aec77cbbfa4bdd7 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -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

diff --git a/server/mpm/winnt/mpm_winnt.h b/server/mpm/winnt/mpm_winnt.h
index 2d9a7526a345b5d49a51f22bfae36095d0ca10a6..2b06e1328b707477f57560931cce77bb278acd58 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.h
+++ b/server/mpm/winnt/mpm_winnt.h
@@ -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"