diff options
| author | Gregg Lewis Smith <gsmith@apache.org> | 2015-09-28 23:34:58 +0000 |
|---|---|---|
| committer | Gregg Lewis Smith <gsmith@apache.org> | 2015-09-28 23:34:58 +0000 |
| commit | 0c2bd104ef2641e5547caabd4dd2ec6ea7c7a85e (patch) | |
| tree | 1a3b9f376531b6c75ff8fdc8ea5cd0712bb54fa3 /Makefile.win | |
| parent | c8dc4e3b7edbffb07ddd447c81555a0fd080b6a5 (diff) | |
| download | httpd-0c2bd104ef2641e5547caabd4dd2ec6ea7c7a85e.tar.gz | |
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
Diffstat (limited to 'Makefile.win')
| -rw-r--r-- | Makefile.win | 12 |
1 files changed, 6 insertions, 6 deletions
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 |