From: Yang Tse <yangsita@gmail.com>
Date: Wed, 12 Jan 2011 17:07:04 +0000 (+0100)
Subject: build: BCC - recover lost functionality from commit 3d813204260b37289411
X-Git-Tag: curl-7_21_4~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f7d34811a1ff21d4a8962e3c7c99d4a702bd684;p=curl

build: BCC - recover lost functionality from commit 3d813204260b37289411

Borland's $(MAKEDIR) expands to the path where make.exe is located,
use this feature to define BCCDIR when user has not defined BCCDIR.
---

diff --git a/lib/Makefile.b32 b/lib/Makefile.b32
index 507a08912..eec7541be 100644
--- a/lib/Makefile.b32
+++ b/lib/Makefile.b32
@@ -10,9 +10,10 @@
 #  Written by Jaepil Kim, pit@paradise.net.nz
 ############################################################
 
-# Check if BCCDIR is set.
-!if !$d(BCCDIR)
-!error BCCDIR not defined
+# Borland's $(MAKEDIR) expands to the path where make.exe is located,
+# use this feature to define BCCDIR when user has not defined BCCDIR.
+!if "$(BCCDIR)" == ""
+BCCDIR = $(MAKEDIR)\..
 !endif
 
 # Edit the path below to point to the base of your Zlib sources.
diff --git a/src/Makefile.b32 b/src/Makefile.b32
index 2f0a07794..53e9f2d05 100644
--- a/src/Makefile.b32
+++ b/src/Makefile.b32
@@ -10,9 +10,10 @@
 #  Written by Jaepil Kim, pit@paradise.net.nz
 ############################################################
 
-# Check if BCCDIR is set.
-!if !$d(BCCDIR)
-!error BCCDIR not defined
+# Borland's $(MAKEDIR) expands to the path where make.exe is located,
+# use this feature to define BCCDIR when user has not defined BCCDIR.
+!if "$(BCCDIR)" == ""
+BCCDIR = $(MAKEDIR)\..
 !endif
 
 # Edit the path below to point to the base of your Zlib sources.