From 98c4dd7c60b518c2a9e292a2b17ac1860c03ded8 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Sun, 10 May 2009 18:35:08 +0000
Subject: [PATCH] remove BMAKE (build make): a cc compiler should use own make

---
 auto/cc/msvc | 19 ++++---------------
 auto/cc/owc  |  6 ++++++
 auto/make    | 12 +-----------
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/auto/cc/msvc b/auto/cc/msvc
index d002bec38..11c4682cf 100644
--- a/auto/cc/msvc
+++ b/auto/cc/msvc
@@ -124,25 +124,14 @@ ngx_binout="-Fe"
 ngx_objext="obj"
 ngx_binext=".exe"
 
-if [ "$BMAKE" = nmake ]; then
-    # MS nmake
-
-    ngx_long_start='@<<
+ngx_long_start='@<<
         '
-    ngx_long_end='<<'
-    ngx_long_regex_cont=' \
+ngx_long_end='<<'
+ngx_long_regex_cont=' \
 	'
-    ngx_long_cont='
+ngx_long_cont='
 	'
 
-else
-    # Borland make
-
-    ngx_long_start='@&&|
-        '
-    ngx_long_end='|'
-fi
-
 # MSVC understand / in path
 #ngx_regex_dirsep='\\'
 #ngx_dirsep="\\"
diff --git a/auto/cc/owc b/auto/cc/owc
index 1a5fa210b..bd0cd40c2 100644
--- a/auto/cc/owc
+++ b/auto/cc/owc
@@ -87,3 +87,9 @@ ngx_binext=".exe"
 
 ngx_regex_dirsep='\\'
 ngx_dirsep="\\"
+
+ngx_regex_cont=' '
+ngx_long_regex_cont=' '
+ngx_cont=' '
+ngx_long_cont=' '
+ngx_tab=' '
diff --git a/auto/make b/auto/make
index 2c827a311..d14bf6174 100644
--- a/auto/make
+++ b/auto/make
@@ -23,22 +23,12 @@ LINK =	$LINK
 
 END
 
+
 if test -n "$NGX_PERL_CFLAGS"; then
     echo NGX_PERL_CFLAGS = $NGX_PERL_CFLAGS                   >> $NGX_MAKEFILE
     echo NGX_PM_CFLAGS = $NGX_PM_CFLAGS                       >> $NGX_MAKEFILE
 fi
 
-if [ "$BMAKE" = wmake ]; then
-    echo MAKE = wmake                                         >> $NGX_MAKEFILE
-
-    ngx_regex_cont=' '
-    ngx_long_regex_cont=' '
-    ngx_cont=' '
-    ngx_long_cont=' '
-    ngx_tab=' '
-
-fi
-
 
 # ALL_INCS, required by the addons and by OpenWatcom C precompiled headers