From owner-p4-projects@FreeBSD.ORG  Fri Feb 15 20:06:18 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 20931D7B; Fri, 15 Feb 2013 20:06:18 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D8435D79
 for <perforce@freebsd.org>; Fri, 15 Feb 2013 20:06:17 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BEF401C0
 for <perforce@freebsd.org>; Fri, 15 Feb 2013 20:06:17 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1FK6HXF063627
 for <perforce@freebsd.org>; Fri, 15 Feb 2013 20:06:17 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1FK6H0u063624
 for perforce@freebsd.org; Fri, 15 Feb 2013 20:06:17 GMT
 (envelope-from brooks@freebsd.org)
Date: Fri, 15 Feb 2013 20:06:17 GMT
Message-Id: <201302152006.r1FK6H0u063624@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 222077 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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, 15 Feb 2013 20:06:18 -0000

http://p4web.freebsd.org/@@222077?ac=10

Change 222077 by brooks@brooks_zenith on 2013/02/15 20:06:02

	Don't install magic.h twice.  It upsets the image creation tools.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_magic/Makefile#2 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_magic/Makefile#2 (text+ko) ====

@@ -12,7 +12,6 @@
 SRCS=	apprentice.c apptype.c ascmagic.c cdf.c cdf_time.c compress.c \
 	encoding.c fsmagic.c funcs.c \
 	is_tar.c magic.c print.c readcdf.c readelf.c softmagic.c
-INCS=	magic.h
 
 MAGICPATH?=	/usr/share/misc