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

diff --git a/Makefile.win b/Makefile.win
index 48c9ed8e3aea098512edcf4fad73cfd4dfeb9dc2..b3a2898bc3803f5c69e9d31c101c941ee97abc01 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -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

diff --git a/server/mpm/winnt/mpm_winnt.h b/server/mpm/winnt/mpm_winnt.h
index 2d9a7526a345b5d49a51f22bfae36095d0ca10a6..dfe0e5187224f6ee0e83773089e399bd4848d21b 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.2"
 #endif
 
 #define SERVICECONFIG9X "Software\\Microsoft\\Windows\\CurrentVersion\\RunServices"