add attribution

[apache] / Makefile.win

diff --git a/Makefile.win b/Makefile.win
index d619ac95efa84b1771b910e983ffacda393b7cee..c1f93cf3eb9066d3008b19d22e9809faaacc8518 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -46,7 +46,7 @@
 # so the server root should be given in forward slashes (quoted),
 # preferably with the drive designation!
 
-!IF EXIST("httpd.vcproj") && ([devenv /help > NUL 2>&1] == 0) \
+!IF EXIST("Apache.sln") && ([devenv /help > NUL 2>&1] == 0) \
     && !defined(USEMAK) && !defined(USEDSW)
 USESLN=1
 USEMAK=0
@@ -557,7 +557,7 @@ _build:
         $(MAKE) $(MAKEOPT) -f mod_proxy_ftp.mak   CFG="mod_proxy_ftp - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_proxy_http.mak  CFG="mod_proxy_http - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_proxy_scgi.mak  CFG="mod_proxy_scgi - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f mod_proxy_websocket.mak  CFG="mod_proxy_websocket - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_proxy_wstunnel.mak  CFG="mod_proxy_wstunnel - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 !IF EXIST("srclib\serf")
         $(MAKE) $(MAKEOPT) -f mod_serf.mak        CFG="mod_serf - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 !ENDIF
@@ -712,7 +712,11 @@ _copybin:
 !IF EXIST("srclib\serf")
        copy srclib\serf\$(LONG)\libserf.$(src_dll)             "$(inst_dll)" <.y
 !ENDIF
+!IF "$(SHORT)" == "D"
+       copy srclib\pcre\pcred.$(src_dll)                       "$(inst_dll)" <.y
+!ELSE
        copy srclib\pcre\pcre.$(src_dll)                        "$(inst_dll)" <.y
+!ENDIF 
        copy modules\aaa\$(LONG)\mod_access_compat.$(src_so)    "$(inst_so)" <.y
        copy modules\aaa\$(LONG)\mod_allowhandlers.$(src_so)    "$(inst_so)" <.y
        copy modules\aaa\$(LONG)\mod_allowmethods.$(src_so)     "$(inst_so)" <.y
@@ -833,7 +837,7 @@ _copybin:
        copy modules\proxy\$(LONG)\mod_proxy_ftp.$(src_so)      "$(inst_so)" <.y
        copy modules\proxy\$(LONG)\mod_proxy_http.$(src_so)     "$(inst_so)" <.y
        copy modules\proxy\$(LONG)\mod_proxy_scgi.$(src_so)     "$(inst_so)" <.y
-       copy modules\proxy\$(LONG)\mod_proxy_websocket.$(src_so)        "$(inst_so)" <.y
+       copy modules\proxy\$(LONG)\mod_proxy_wstunnel.$(src_so)         "$(inst_so)" <.y
 !IF EXIST("srclib\serf")
        copy modules\proxy\$(LONG)\mod_serf.$(src_so)           "$(inst_so)" <.y
 !ENDIF