Backport, even to 1.3, the ability to build under devenv

  of Visual Studio 2005.  Endorse -f syntax to get folks
  used to portable make semantics

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@357229 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/makefile.win b/src/makefile.win
index a646f019db0ad4b6112a7af21d188fcc1087afce..fc53e1cb58d4b75b51cec271148e09df8c78c220 100644 (file)
--- a/src/makefile.win
+++ b/src/makefile.win
@@ -12,7 +12,7 @@
 # The default installation directory is \Apache. This can be changed
 # with the INSTDIR macro, for example:
 #
-#   nmake /f Makefile.win INSTDIR="d:\Program Files\Apache" installr
+#   nmake -f Makefile.win INSTDIR="d:\Program Files\Apache" installr
 #
 # Note: this does *NOT* change the compiled in default "server root"
 # Also be aware that certain awk's will not accept backslahed names,
@@ -24,15 +24,15 @@ INSTDIR=\Apache
 !MESSAGE Using default install directory \Apache
 !ENDIF 
 
-!IF "$(MAKE)" == "NMAKE"
+!IFNDEF MAKEOPT
+# Only default the behavior if MAKEOPT= is omitted
+!IFDEF _NMAKE_VER
 # Microsoft NMake options
 MAKEOPT=-nologo
 !ELSEIF "$(MAKE)" == "make"
-# Borland make options 
-# Borland build of Apache is highly experimental and unsupported.
+# Borland make options?  Not really supported (yet)
 MAKEOPT=-s -N
-!ELSE
-!MESSAGE Warning: unrecognized build command "$(MAKE)"
+!ENDIF
 !ENDIF
 
 default:        _apacher