From: William A. Rowe Jr Date: Fri, 2 Dec 2005 12:33:27 +0000 (+0000) Subject: Backport fix for mod_charset_lite 2.2.0 build breakage on Win32 X-Git-Tag: 2.2.1~230 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cef5db9e3a474a70c4ad43c8f14f8e2208fdcabb;p=thirdparty%2Fapache%2Fhttpd.git Backport fix for mod_charset_lite 2.2.0 build breakage on Win32 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@351702 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/Makefile.win b/Makefile.win index 5d6aa8cfa8c..124e5769432 100644 --- a/Makefile.win +++ b/Makefile.win @@ -246,9 +246,9 @@ _build: $(MAKE) $(MAKEOPT) -f mod_dumpio.mak CFG="mod_dumpio - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. cd modules\experimental - $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. cd modules\filters + $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET) !IF EXIST("srclib\zlib") $(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET) !ENDIF @@ -400,7 +400,7 @@ _copybin: copy modules\dav\main\$(LONG)\mod_dav.$(src_so) "$(inst_so)" <.y copy modules\debug\$(LONG)\mod_bucketeer.$(src_so) "$(inst_so)" <.y copy modules\debug\$(LONG)\mod_dumpio.$(src_so) "$(inst_so)" <.y - copy modules\experimental\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y + copy modules\filters\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y !IF EXIST("srclib\zlib") copy modules\filters\$(LONG)\mod_deflate.$(src_so) "$(inst_so)" <.y !IF EXIST("srclib\zlib\zlib1.$(src_dll)")