From 0c2bd104ef2641e5547caabd4dd2ec6ea7c7a85e Mon Sep 17 00:00:00 2001 From: Gregg Lewis Smith Date: Mon, 28 Sep 2015 23:34:58 +0000 Subject: [PATCH] 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 --- Apache-apr2.dsw | 2 +- Apache.dsw | 2 +- Makefile.win | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw index db8f9c455f..8f33680361 100644 --- 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 bfbab3f584..1b0f8c6be3 100644 --- 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 0212dd5240..60abcb0ede 100644 --- 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 -- 2.40.0