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 f0d896dacace2c87aa415628d6841df3cf5747b6..eba96d8031e4fd55ea20e72e57432da10e9ac3cf 100644 (file)
--- 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 03b81e115dab5ba1d672f13dab5e66797fc8998e..0c1d17041621fca2f697856b6fa76d73742a52a1 100644 (file)
--- 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