From owner-p4-projects@FreeBSD.ORG  Sun Feb  1 17:55:56 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5D0B71065670; Sun,  1 Feb 2009 17:55:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1D432106564A
	for <perforce@freebsd.org>; Sun,  1 Feb 2009 17:55:56 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0A8728FC08
	for <perforce@freebsd.org>; Sun,  1 Feb 2009 17:55:56 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n11Htt21024056
	for <perforce@freebsd.org>; Sun, 1 Feb 2009 17:55:55 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n11HttTl024054
	for perforce@freebsd.org; Sun, 1 Feb 2009 17:55:55 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 1 Feb 2009 17:55:55 GMT
Message-Id: <200902011755.n11HttTl024054@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 156999 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sun, 01 Feb 2009 17:55:57 -0000

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

Change 156999 by rwatson@rwatson_freebsd_capabilities on 2009/02/01 17:55:21

	There has never been a ld-elf-cap.so in /usr/libexec so don't
	set up a symlink.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#9 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#9 (text+ko) ====

@@ -1,5 +1,5 @@
 # $FreeBSD$
-# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#8 $
+# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#9 $
 
 WITHOUT_SSP=
 
@@ -18,7 +18,6 @@
 INSTALLFLAGS=	-C -b
 PRECIOUSPROG=
 BINDIR=		/libexec
-SYMLINKS=	${BINDIR}/${PROG} /usr/libexec/${PROG}
 
 CFLAGS+=	-fpic -DPIC
 LDFLAGS+=	-shared -Wl,-Bsymbolic
@@ -46,17 +45,9 @@
 .include "${.CURDIR}/../rtld-elf/${MACHINE_ARCH}/Makefile.inc"
 .endif
 
-# Since moving rtld-elf to /libexec, we need to create a symlink.
-# Fixup the existing binary that's there so we can symlink over it.
-beforeinstall:
-.if exists(${DESTDIR}/usr/libexec/${PROG})
-	-chflags noschg ${DESTDIR}/usr/libexec/${PROG}
-.endif
-
 .PATH: ${.CURDIR}/../rtld-elf
 .PATH: ${.CURDIR}/../rtld-elf/${MACHINE_ARCH}
 .PATH: ${.CURDIR}/../../lib/csu/common
 
-
 .include <bsd.symver.mk>
 .include <bsd.prog.mk>