# 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 # # Author: wrowe # Date: Mon Dec 5 01:07:33 2005 # New Revision: 354026 # # URL: http://svn.apache.org/viewcvs?rev=354026&view=rev # Log: # # Commit a typo-fix identified by Jorge Schrauwen # that will be touched in the -rev2 win32 source bundle. Apparently # this code is gone from svn trunk, so there's nothing to forward port. # Index: Makefile.win =================================================================== --- Makefile.win (revision 351701) +++ Makefile.win (revision 354026) @@ -130,7 +130,7 @@ !IF "$(MAKE)" == "NMAKE" # Microsoft NMake options MAKEOPT=-nologo -!ELSEIF "($MAKE)" == "make" +!ELSEIF "$(MAKE)" == "make" # Borland make options? Not really supported (yet) MAKEOPT=-s -N !ENDIF @@ -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)")