PERFORCE change 156999 for review

Robert Watson rwatson at FreeBSD.org
Sun Feb 1 09:55:57 PST 2009


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

Change 156999 by rwatson at 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>


More information about the p4-projects mailing list