httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r357229 - /httpd/httpd/branches/1.3.x/src/makefile.win
Date Fri, 16 Dec 2005 21:03:13 GMT
Author: wrowe
Date: Fri Dec 16 13:03:09 2005
New Revision: 357229

URL: http://svn.apache.org/viewcvs?rev=357229&view=rev
Log:

  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

Modified:
    httpd/httpd/branches/1.3.x/src/makefile.win

Modified: httpd/httpd/branches/1.3.x/src/makefile.win
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/1.3.x/src/makefile.win?rev=357229&r1=357228&r2=357229&view=diff
==============================================================================
--- httpd/httpd/branches/1.3.x/src/makefile.win (original)
+++ httpd/httpd/branches/1.3.x/src/makefile.win Fri Dec 16 13:03:09 2005
@@ -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 @@
 !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



Mime
View raw message