Follow up to r1705751 to pick up a few strays

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705790 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw
index db8f9c455fc574fa38919d6d23b932136cfe0768..8f33680361864051a3b28b81dffdf529fa0006b8 100644 (file)
--- a/Apache-apr2.dsw
+++ b/Apache-apr2.dsw
@@ -1723,7 +1723,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_h2"=.\modules\http2\mod_h2.dsp - Package Owner=<4>
+Project: "mod_http2"=.\modules\http2\mod_http2.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

diff --git a/Apache.dsw b/Apache.dsw
index bfbab3f584ad12089e3aa5bf517e9398ebd00e5b..1b0f8c6be34773b65d02b38e87ab5525b52a151b 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -2041,7 +2041,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_h2"=.\modules\http2\mod_h2.dsp - Package Owner=<4>
+Project: "mod_http2"=.\modules\http2\mod_http2.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

diff --git a/Makefile.win b/Makefile.win
index 0212dd52401171e2624c6e94701c41cfaa829e47..60abcb0ede5f19da88d019731feab141c4ee00db 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -220,13 +220,13 @@ _trylua:
 _trynghttp2:
 !IF $(USEMAK) == 1
        cd modules\http2
-       $(MAKE) $(MAKEOPT) -f mod_h2.mak CFG="mod_h2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+       $(MAKE) $(MAKEOPT) -f mod_http2.mak CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
 !ELSEIF $(USESLN) == 1
-       devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_h2
+       devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_http2
 !ELSE
        @msdev $(TLP).dsw /USEENV /MAKE \
-               "mod_h2 - Win32 $(LONG)" /NORECURSE $(CTARGET)
+               "mod_http2 - Win32 $(LONG)" /NORECURSE $(CTARGET)
 !ENDIF
 
 !ELSE
@@ -234,7 +234,7 @@ _trynghttp2:
 
 _trynghttp2:
        @echo -----
-       @echo mod_h2 will not build unless nghttp2 is installed in srclib\nghttp2.
+       @echo mod_http2 will not build unless nghttp2 is installed in srclib\nghttp2.
        @echo Version 1.0 includes an lib\makefile.msvc that will satisfy this
        @echo requirement.
 
@@ -508,7 +508,7 @@ _build:
        cd ..\..
 !IF EXIST("srclib\nghttp2")
        cd modules\http2
-        $(MAKE) $(MAKEOPT) -f mod_h2.mak         CFG="mod_h2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_http2.mak         CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
 !ENDIF
        cd modules\loggers
@@ -784,7 +784,7 @@ _copybin:
        copy modules\generators\$(LONG)\mod_status.$(src_so)    "$(inst_so)" <.y
        copy modules\http\$(LONG)\mod_mime.$(src_so)            "$(inst_so)" <.y
 !IF EXIST("srclib\nghttp2")
-       copy modules\http2\$(LONG)\mod_h2.$(src_so)             "$(inst_so)" <.y
+       copy modules\http2\$(LONG)\mod_http2.$(src_so)          "$(inst_so)" <.y
 !IF "$(SHORT)" == "D"
        copy srclib\nghttp2\lib\MSVC_obj\nghttp2d.$(src_dll)                    "$(inst_dll)" <.y
 !ELSE