You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Jerry Baker <je...@weirdness.com> on 2002/05/07 09:47:46 UTC

[PATCH] Re: Apache.dsw Lost mod_deflate (and makefile.win)

The following appears to work fine here.

Index: Apache.dsw
===================================================================
RCS file: /home/cvspublic/httpd-2.0/Apache.dsw,v
retrieving revision 1.79
diff -u -r1.79 Apache.dsw
--- Apache.dsw	1 May 2002 15:23:13 -0000	1.79
+++ Apache.dsw	7 May 2002 07:35:14 -0000
@@ -750,7 +750,7 @@
 
 ###############################################################################
 
-Project: "mod_deflate"=".\modules\experimental\mod_deflate.dsp" - Package Owner=<4>
+Project: "mod_deflate"=".\modules\filters\mod_deflate.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{

Index: Makefile.win
===================================================================
RCS file: /home/cvspublic/httpd-2.0/Makefile.win,v
retrieving revision 1.98
diff -u -r1.98 Makefile.win
--- Makefile.win	29 Apr 2002 19:53:55 -0000	1.98
+++ Makefile.win	7 May 2002 07:40:11 -0000
@@ -81,8 +81,8 @@
 !IF EXIST("srclib\zlib")
 
 _tryzlib:
-!IF EXIST("modules\experimental\mod_deflate.mak")
-	cd modules\experimental
+!IF EXIST("modules\filters\mod_deflate.mak")
+	cd modules\filters
 	$(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 .\$(LONG)\mod_deflate.so
 	cd ..\..
 !ELSE
@@ -208,11 +208,11 @@
 	 $(MAKE) $(MAKEOPT) -f mod_mem_cache.mak   CFG="mod_mem_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_disk_cache.mak  CFG="mod_disk_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak  CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+	cd ..\..
+	cd modules\filters
 !IF EXIST("srclib\zlib")
 	 $(MAKE) $(MAKEOPT) -f mod_deflate.mak     CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 !ENDIF
-	cd ..\..
-	cd modules\filters
 	 $(MAKE) $(MAKEOPT) -f mod_include.mak     CFG="mod_include - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..\..
 	cd modules\generators
@@ -459,7 +459,7 @@
    }
 }
 <<
-	copy modules\experimental\$(LONG)\mod_deflate.so "$(INSTDIR)\modules" <.y
+	copy modules\filters\$(LONG)\mod_deflate.so "$(INSTDIR)\modules" <.y
 !ENDIF
 	copy support\$(LONG)\htdbm.exe "$(INSTDIR)\bin" <.y
 	copy support\$(LONG)\htdigest.exe "$(INSTDIR)\bin" <.y

-- 
Jerry Baker

Re: [PATCH] Re: Apache.dsw Lost mod_deflate (and makefile.win)

Posted by Cliff Woolley <jw...@virginia.edu>.
On Tue, 7 May 2002, Jerry Baker wrote:

> The following appears to work fine here.

Looks okay to my untrained eye.  Committed.

--Cliff

--------------------------------------------------------------
   Cliff Woolley
   cliffwoolley@yahoo.com
   Charlottesville, VA