From: Cliff Woolley <jwoolley@apache.org>
Date: Tue, 7 May 2002 08:01:46 +0000 (+0000)
Subject: Fix win32 build breakage
X-Git-Tag: 2.0.37~466
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26fd6622d699df4c88efbce75e3a074a7c4f498c;p=apache

Fix win32 build breakage

Submitted by:  Jerry Baker


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94993 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/Apache.dsw b/Apache.dsw
index f0d896daca..eba96d8031 100644
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -750,7 +750,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_deflate"=".\modules\experimental\mod_deflate.dsp" - Package Owner=<4>
+Project: "mod_deflate"=".\modules\filters\mod_deflate.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/Makefile.win b/Makefile.win
index 03b81e115d..0c1d170416 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -81,8 +81,8 @@ _tryssl:
 !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 @@ _build:
 	 $(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 @@ _install:
    }
 }
 <<
-	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