From a3c71888d57c17eeaa86a8573b21564c8709346a Mon Sep 17 00:00:00 2001
From: hoek <hoek@FreeBSD.org>
Date: Thu, 12 Aug 1999 13:30:08 +0000
Subject: Bugfix to last commit: Correctly intuit when an lhs is a string vs.
 number.

---
 usr.bin/make/cond.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index ddb62f6..5eb420e 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cond.c,v 1.7 1997/02/22 19:27:07 peter Exp $
+ *	$Id: cond.c,v 1.8 1999/05/25 13:45:08 hoek Exp $
  */
 
 #ifndef lint
@@ -707,7 +707,8 @@ do_string_compare:
 				condExpr += len;
 			}
 		    } else {
-			if (CondCvtArg(rhs, &right) == rhs)
+			char *c = CondCvtArg(rhs, &right);
+			if (*c != '\0' && !isspace(*c))
 			    goto do_string_compare;
 			if (rhs == condExpr) {
 			    /*
-- 
cgit v1.1