You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2005/12/16 21:56:24 UTC
svn commit: r357227 - /httpd/httpd/branches/2.2.x/Makefile.win
Author: wrowe
Date: Fri Dec 16 12:56:21 2005
New Revision: 357227
URL: http://svn.apache.org/viewcvs?rev=357227&view=rev
Log:
Test _NMAKE_VER define to determine nmake -nologo behavior,
and use $(MAKEOPT) -f syntax throughout to avoid problems
on mingw, borland, etc.
Backport 357226 from trunk
Claiming platform maintainer privs to just fix this for VS2005
Modified:
httpd/httpd/branches/2.2.x/Makefile.win
Modified: httpd/httpd/branches/2.2.x/Makefile.win
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/Makefile.win?rev=357227&r1=357226&r2=357227&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/Makefile.win (original)
+++ httpd/httpd/branches/2.2.x/Makefile.win Fri Dec 16 12:56:21 2005
@@ -19,7 +19,7 @@
#
# For example;
#
-# nmake /f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr
+# nmake -f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr
#
# Be aware that certain awk's will not accept backslahed names,
# so the server root should be given in forward slashes (quoted),
@@ -119,15 +119,15 @@
!MESSAGE SERVERNAME = $(SERVERNAME)
!MESSAGE PORT = $(PORT)
!MESSAGE
-!MESSAGE To change these options use 'nmake /f Makefile.win [option=value]'
-!MESSAGE Example: nmake /f Makefile.win PORT=8080
+!MESSAGE To change these options use 'nmake -f Makefile.win [option=value]'
+!MESSAGE Example: nmake -f Makefile.win PORT=8080
!MESSAGE
!MESSAGE
!ENDIF
!IFNDEF MAKEOPT
# Only default the behavior if MAKEOPT= is omitted
-!IF "$(MAKE)" == "NMAKE"
+!IFDEF _NMAKE_VER
# Microsoft NMake options
MAKEOPT=-nologo
!ELSEIF "$(MAKE)" == "make"
@@ -178,14 +178,14 @@
$(MAKE) $(MAKEOPT) -f apriconv.mak CFG="apriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f libapriconv.mak CFG="libapriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)
!IF "$(CTARGET)" == "CLEAN"
- $(MAKE) $(MAKEOPT) /f build\modules.mk.win clean \
+ $(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=.
!ELSE
cd ccs
- $(MAKE) /nologo /f Makefile.win all \
+ $(MAKE) $(MAKEOPT) -f Makefile.win all \
BUILD_MODE=$(LONG) BIND_MODE=shared
cd ..\ces
- $(MAKE) /nologo /f Makefile.win all \
+ $(MAKE) $(MAKEOPT) -f Makefile.win all \
BUILD_MODE=$(LONG) BIND_MODE=shared
cd ..
!ENDIF
@@ -360,7 +360,7 @@
"BuildBin - Win32 $(LONG)" $(CTARGET)
!IF "$(CTARGET)" == "/CLEAN"
@cd srclib\apr-iconv
- @$(MAKE) $(MAKEOPT) /f build\modules.mk.win clean \
+ @$(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=.
@cd ..\..
!ENDIF