From owner-cvs-src@FreeBSD.ORG  Tue Jul 20 07:42:07 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 7AFB016A4CE; Tue, 20 Jul 2004 07:42:07 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 5F26843D45; Tue, 20 Jul 2004 07:42:07 +0000 (GMT)
	(envelope-from harti@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6K7g7Ej085044;
	Tue, 20 Jul 2004 07:42:07 GMT
	(envelope-from harti@repoman.freebsd.org)
Received: (from harti@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6K7g7mb085043;
	Tue, 20 Jul 2004 07:42:07 GMT
	(envelope-from harti)
Message-Id: <200407200742.i6K7g7mb085043@repoman.freebsd.org>
From: Hartmut Brandt <harti@FreeBSD.org>
Date: Tue, 20 Jul 2004 07:42:07 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/usr.bin/make cond.c make.h parse.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jul 2004 07:42:07 -0000

harti       2004-07-20 07:42:07 UTC

  FreeBSD src repository

  Modified files:
    usr.bin/make         cond.c make.h parse.c 
  Log:
  Improve make's diagnostic of mistmatched .if-.endif. This patch is
  slightly different from the patch in the PR. The problem is, that
  make handles .if clauses inside false .if clauses simply by
  counting them - it doesn't put them onto the conditional stack, nor even
  parses them so we need an extra line number stack for these ifs.
  
  PR:             bin/61257
  Submitted by:   Mikhail Teterin <mi@aldan.algebra.com>
  
  Revision  Changes    Path
  1.28      +21 -2     src/usr.bin/make/cond.c
  1.24      +16 -0     src/usr.bin/make/make.h
  1.56      +1 -15     src/usr.bin/make/parse.c