Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"
MIME-Version: 1.0
Date: Mon, 15 Jul 2013 16:22:15 -0400
From: "Christos Zoulas" <christos@netbsd.org>
Subject: CVS commit: pkgsrc/mk
To: pkgsrc-changes@NetBSD.org
Reply-To: christos@netbsd.org
Message-Id: <20130715202215.C5FBB96@cvs.netbsd.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

Module Name:	pkgsrc
Committed By:	christos
Date:		Mon Jul 15 20:22:15 UTC 2013

Modified Files:
	pkgsrc/mk: bsd.pkg.mk

Log Message:
Reset MAKELEVEL=0 to fix bad gmake/bsdmake interactions.
Our make(1) now sets $MAKELEVEL. While this should cause no harm, gmake
detects a non-zero $MAKELEVEL and automatically sets "w" in $MAKEFLAGS
for subordinate makes, in order to print the entry and exit directories.
Our make, does not understand -w, so it prints an error message and exits.

In order to catch this everywhere (since cmake for example can invoke
either our make or gmake depending on how it feels), we reset the variable
for any top level command. This effectively reverts to the behavior of
our make not setting $MAKELEVEL.


To generate a diff of this commit:
cvs rdiff -u -r1.1992 -r1.1993 pkgsrc/mk/bsd.pkg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.