From owner-p4-projects  Wed May  1  7: 6: 1 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 33D4F37B41B; Wed,  1 May 2002 07:05:57 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 0C95F37B41A
	for <perforce@freebsd.org>; Wed,  1 May 2002 07:05:56 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g41E5tm92318
	for perforce@freebsd.org; Wed, 1 May 2002 07:05:55 -0700 (PDT)
	(envelope-from green@freebsd.org)
Date: Wed, 1 May 2002 07:05:55 -0700 (PDT)
Message-Id: <200205011405.g41E5tm92318@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f
From: Brian Feldman <green@FreeBSD.org>
Subject: PERFORCE change 10580 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10580

Change 10580 by green@green_laptop_2 on 2002/05/01 07:05:38

	Fix a merge-o preventing release build.

Affected files ...

... //depot/projects/trustedbsd/mac/release/Makefile#14 edit

Differences ...

==== //depot/projects/trustedbsd/mac/release/Makefile#14 (text+ko) ====

@@ -131,7 +131,7 @@
 .endif
 OTHER_DISTS?=	games catpages manpages proflibs dict info doc
 CRYPTO_DISTS?=	crypto krb4 krb5
-BIN_DISTS?=	base
+BASE_DISTS?=	base
 DISTRIBUTIONS?=	${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS}
 KERNELS?=	GENERIC MAC
 

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message