httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r483555 - in /httpd/httpd/trunk: Makefile.win server/mpm/winnt/mpm_winnt.h
Date Thu, 07 Dec 2006 17:11:51 GMT
Author: wrowe
Date: Thu Dec  7 09:11:51 2006
New Revision: 483555

URL: http://svn.apache.org/viewvc?view=rev&rev=483555
Log:
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.)

Modified:
    httpd/httpd/trunk/Makefile.win
    httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h

Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?view=diff&rev=483555&r1=483554&r2=483555
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Thu Dec  7 09:11:51 2006
@@ -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 @@
 !ENDIF
 
 !IF "$(INSTDIR)" == ""
-INSTDIR=\Apache2
+INSTDIR=\Apache2x
 !ENDIF
 !IF "$(SERVERNAME)" == ""
 SERVERNAME=localhost

Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h?view=diff&rev=483555&r1=483554&r2=483555
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h Thu Dec  7 09:11:51 2006
@@ -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"



Mime
View raw message