Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 14842 invoked from network); 2 Dec 2005 12:33:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Dec 2005 12:33:51 -0000 Received: (qmail 22678 invoked by uid 500); 2 Dec 2005 12:33:50 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 22641 invoked by uid 500); 2 Dec 2005 12:33:49 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 22626 invoked by uid 99); 2 Dec 2005 12:33:49 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 02 Dec 2005 04:33:49 -0800 Received: (qmail 14455 invoked by uid 65534); 2 Dec 2005 12:33:29 -0000 Message-ID: <20051202123329.14452.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r351702 - /httpd/httpd/branches/2.2.x/Makefile.win Date: Fri, 02 Dec 2005 12:33:28 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: wrowe Date: Fri Dec 2 04:33:27 2005 New Revision: 351702 URL: http://svn.apache.org/viewcvs?rev=351702&view=rev Log: Backport fix for mod_charset_lite 2.2.0 build breakage on Win32 Modified: httpd/httpd/branches/2.2.x/Makefile.win Modified: httpd/httpd/branches/2.2.x/Makefile.win URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/Makefile.win?rev=351702&r1=351701&r2=351702&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/Makefile.win (original) +++ httpd/httpd/branches/2.2.x/Makefile.win Fri Dec 2 04:33:27 2005 @@ -246,9 +246,9 @@ $(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 @@ 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)")