From: William A. Rowe Jr Date: Mon, 12 Apr 2004 22:22:45 +0000 (+0000) Subject: Relative paths are a bit cleaner when invoking apr/build/win32fixmak.pl X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5285eb3324477b18a88cad6351641ef993a576a;p=thirdparty%2Fapache%2Fhttpd.git Relative paths are a bit cleaner when invoking apr/build/win32fixmak.pl from the root apache1.3 directory, instead of from apache1.3/src (don't ask me why, the absolute -> relative path logic I wrote in the .pl is very twisted.) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@103377 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/ApacheCore.dep b/src/ApacheCore.dep index 4931609ea0e..24fb5e087e1 100644 --- a/src/ApacheCore.dep +++ b/src/ApacheCore.dep @@ -745,3 +745,16 @@ ".\os\win32\os.h"\ ".\os\win32\readdir.h"\ + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" + +!ENDIF + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" + +!ENDIF + diff --git a/src/os/win32/mod_auth_anon.mak b/src/os/win32/mod_auth_anon.mak index 36a7a1a81bd..80c9b253bf1 100644 --- a/src/os/win32/mod_auth_anon.mak +++ b/src/os/win32/mod_auth_anon.mak @@ -212,24 +212,24 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_auth_anon - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" diff --git a/src/os/win32/mod_auth_dbm.mak b/src/os/win32/mod_auth_dbm.mak index 88fe867716a..29bc15b6a34 100644 --- a/src/os/win32/mod_auth_dbm.mak +++ b/src/os/win32/mod_auth_dbm.mak @@ -214,24 +214,24 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_auth_dbm - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" @@ -240,24 +240,24 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_auth_dbm - Win32 Release" "sdbm - Win32 Release" : - cd "..\../..\src\lib\sdbm" + cd ".\..\..\lib\sdbm" $(MAKE) /$(MAKEFLAGS) /F ".\sdbm.mak" CFG="sdbm - Win32 Release" cd "..\..\os\win32" "sdbm - Win32 ReleaseCLEAN" : - cd "..\../..\src\lib\sdbm" + cd ".\..\..\lib\sdbm" $(MAKE) /$(MAKEFLAGS) /F ".\sdbm.mak" CFG="sdbm - Win32 Release" RECURSE=1 CLEAN cd "..\..\os\win32" !ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" "sdbm - Win32 Debug" : - cd "..\../..\src\lib\sdbm" + cd ".\..\..\lib\sdbm" $(MAKE) /$(MAKEFLAGS) /F ".\sdbm.mak" CFG="sdbm - Win32 Debug" cd "..\..\os\win32" "sdbm - Win32 DebugCLEAN" : - cd "..\../..\src\lib\sdbm" + cd ".\..\..\lib\sdbm" $(MAKE) /$(MAKEFLAGS) /F ".\sdbm.mak" CFG="sdbm - Win32 Debug" RECURSE=1 CLEAN cd "..\..\os\win32" diff --git a/src/os/win32/mod_auth_digest.mak b/src/os/win32/mod_auth_digest.mak index 7918f650053..7af3f2ba625 100644 --- a/src/os/win32/mod_auth_digest.mak +++ b/src/os/win32/mod_auth_digest.mak @@ -212,24 +212,24 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_auth_digest - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" diff --git a/src/os/win32/mod_cern_meta.mak b/src/os/win32/mod_cern_meta.mak index 22b49447a51..41184db036b 100644 --- a/src/os/win32/mod_cern_meta.mak +++ b/src/os/win32/mod_cern_meta.mak @@ -212,24 +212,24 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_cern_meta - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" diff --git a/src/os/win32/mod_digest.mak b/src/os/win32/mod_digest.mak index 82b1673804e..0119d482354 100644 --- a/src/os/win32/mod_digest.mak +++ b/src/os/win32/mod_digest.mak @@ -212,24 +212,24 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_digest - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_digest - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" diff --git a/src/os/win32/mod_expires.mak b/src/os/win32/mod_expires.mak index 96c8fe30a0b..e5206527195 100644 --- a/src/os/win32/mod_expires.mak +++ b/src/os/win32/mod_expires.mak @@ -212,24 +212,24 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_expires - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_expires - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" diff --git a/src/os/win32/mod_headers.mak b/src/os/win32/mod_headers.mak index 70d0790d893..8c802976595 100644 --- a/src/os/win32/mod_headers.mak +++ b/src/os/win32/mod_headers.mak @@ -212,24 +212,24 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_headers - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_headers - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" diff --git a/src/os/win32/mod_info.mak b/src/os/win32/mod_info.mak index 4b1ca88b957..64f54202687 100644 --- a/src/os/win32/mod_info.mak +++ b/src/os/win32/mod_info.mak @@ -212,24 +212,24 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_info - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_info - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" diff --git a/src/os/win32/mod_mime_magic.mak b/src/os/win32/mod_mime_magic.mak index 99438a9916f..e1eb9f23f2d 100644 --- a/src/os/win32/mod_mime_magic.mak +++ b/src/os/win32/mod_mime_magic.mak @@ -212,24 +212,24 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_mime_magic - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_mime_magic - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" diff --git a/src/os/win32/mod_proxy.mak b/src/os/win32/mod_proxy.mak index 6c120dd6183..00b6993585e 100644 --- a/src/os/win32/mod_proxy.mak +++ b/src/os/win32/mod_proxy.mak @@ -267,24 +267,24 @@ SOURCE=..\..\modules\proxy\proxy_util.c !IF "$(CFG)" == "mod_proxy - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_proxy - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" diff --git a/src/os/win32/mod_rewrite.mak b/src/os/win32/mod_rewrite.mak index e81bb592f4b..2c4c50493e9 100644 --- a/src/os/win32/mod_rewrite.mak +++ b/src/os/win32/mod_rewrite.mak @@ -216,24 +216,24 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_rewrite - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" diff --git a/src/os/win32/mod_speling.mak b/src/os/win32/mod_speling.mak index a1b468eb76a..ee377eab1c9 100644 --- a/src/os/win32/mod_speling.mak +++ b/src/os/win32/mod_speling.mak @@ -212,24 +212,24 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_speling - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_speling - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" diff --git a/src/os/win32/mod_status.mak b/src/os/win32/mod_status.mak index d08f2ba62fa..7c98f71bf8c 100644 --- a/src/os/win32/mod_status.mak +++ b/src/os/win32/mod_status.mak @@ -212,24 +212,24 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_status - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_status - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" diff --git a/src/os/win32/mod_unique_id.mak b/src/os/win32/mod_unique_id.mak index aebfa36f09d..d6d43d991b5 100644 --- a/src/os/win32/mod_unique_id.mak +++ b/src/os/win32/mod_unique_id.mak @@ -212,24 +212,24 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_unique_id - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_unique_id - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" diff --git a/src/os/win32/mod_usertrack.mak b/src/os/win32/mod_usertrack.mak index 9479f6aca05..6e3d15724ba 100644 --- a/src/os/win32/mod_usertrack.mak +++ b/src/os/win32/mod_usertrack.mak @@ -212,24 +212,24 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_usertrack - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" diff --git a/src/os/win32/mod_vhost_alias.mak b/src/os/win32/mod_vhost_alias.mak index c6b47f55d7e..3be0154885f 100644 --- a/src/os/win32/mod_vhost_alias.mak +++ b/src/os/win32/mod_vhost_alias.mak @@ -212,24 +212,24 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_vhost_alias - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_vhost_alias - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\../..\src" + cd ".\..\.." $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32"