From: Colm MacCarthaigh <colm@apache.org>
Date: Tue, 29 Nov 2005 23:34:28 +0000 (+0000)
Subject: Remove the problematic block which is causing problems with the latest versions
X-Git-Tag: 2.3.0~2709
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=573c18f599ab2228fce3af95faf4670274ed5e27;p=thirdparty%2Fapache%2Fhttpd.git

Remove the problematic block which is causing problems with the latest versions
of MSVS. Sacrifice some borland options which don't really work anyway, and for
Borland to work, we'e really going to need a Makefile.bor.


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

diff --git a/Makefile.win b/Makefile.win
index 9408a24ec47..316d2bd96b5 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -127,13 +127,7 @@ PORT=80
 
 !IFNDEF MAKEOPT
 # Only default the behavior if MAKEOPT= is omitted
-!IF "($MAKE)" == "NMAKE"
-# Microsoft NMake options
 MAKEOPT=-nologo
-!ELSEIF "($MAKE)" == "make"
-# Borland make options?  Not really supported (yet)
-MAKEOPT=-s -N
-!ENDIF
 !ENDIF
 
 _dummy: