From owner-p4-projects@FreeBSD.ORG  Fri May  7 07:32:45 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EF8FB16A4D1; Fri,  7 May 2004 07:32:44 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C916A16A4CF
	for <perforce@freebsd.org>; Fri,  7 May 2004 07:32:44 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9BB7943D54
	for <perforce@freebsd.org>; Fri,  7 May 2004 07:32:44 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47EWiGe046911
	for <perforce@freebsd.org>; Fri, 7 May 2004 07:32:44 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47EWiuV046908
	for perforce@freebsd.org; Fri, 7 May 2004 07:32:44 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 07:32:44 -0700 (PDT)
Message-Id: <200405071432.i47EWiuV046908@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52419 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 May 2004 14:32:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=52419

Change 52419 by peter@peter_daintree on 2004/05/07 07:31:54

	Fix mismerge

Affected files ...

.. //depot/projects/hammer/secure/lib/libcrypto/Makefile#11 edit

Differences ...

==== //depot/projects/hammer/secure/lib/libcrypto/Makefile#11 (text+ko) ====

@@ -333,7 +333,7 @@
 _bn_asmpath=	${LCRYPTO_SRC}/crypto/bn/asm
 .endif
 
-.if defined(MAKE_IDEA) && ${MAKE_IDEA} == YES
+.if defined(MAKE_IDEA)
 _ideapath=	${LCRYPTO_SRC}/crypto/idea
 .endif