You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jw...@apache.org on 2002/05/07 10:01:47 UTC
cvs commit: httpd-2.0 Apache.dsw Makefile.win
jwoolley 02/05/07 01:01:46
Modified: . Apache.dsw Makefile.win
Log:
Fix win32 build breakage
Submitted by: Jerry Baker
Revision Changes Path
1.80 +1 -1 httpd-2.0/Apache.dsw
Index: Apache.dsw
===================================================================
RCS file: /home/cvs/httpd-2.0/Apache.dsw,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -u -r1.79 -r1.80
--- Apache.dsw 1 May 2002 15:23:13 -0000 1.79
+++ Apache.dsw 7 May 2002 08:01:46 -0000 1.80
@@ -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>
{{{
1.99 +5 -5 httpd-2.0/Makefile.win
Index: Makefile.win
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.win,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -u -r1.98 -r1.99
--- Makefile.win 29 Apr 2002 19:53:55 -0000 1.98
+++ Makefile.win 7 May 2002 08:01:46 -0000 1.99
@@ -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