Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Dec 2012 14:36:01 +0000 (UTC)
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r243864 - head/libexec/rtld-elf
Message-ID:  <201212041436.qB4Ea12G010817@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pjd
Date: Tue Dec  4 14:36:01 2012
New Revision: 243864
URL: http://svnweb.freebsd.org/changeset/base/243864

Log:
  Use absolute path for /usr/libexec/ld-elf.so.1 symlink.
  
  Requested by:	kan, kib
  
  Use -h flags for chflags, so we won't remove 'schg' flag from system's
  /libexec/ld-elf.so.1.
  
  MFC after:	2 weeks

Modified:
  head/libexec/rtld-elf/Makefile

Modified: head/libexec/rtld-elf/Makefile
==============================================================================
--- head/libexec/rtld-elf/Makefile	Tue Dec  4 14:07:17 2012	(r243863)
+++ head/libexec/rtld-elf/Makefile	Tue Dec  4 14:36:01 2012	(r243864)
@@ -28,7 +28,7 @@ WARNS?=		2
 INSTALLFLAGS=	-C -b
 PRECIOUSPROG=
 BINDIR=		/libexec
-SYMLINKS=	../..${BINDIR}/${PROG} /usr/libexec/${PROG}
+SYMLINKS=	${BINDIR}/${PROG} /usr/libexec/${PROG}
 MLINKS=		rtld.1 ld-elf.so.1.1 \
 		rtld.1 ld.so.1
 
@@ -62,7 +62,7 @@ SYMBOL_MAPS+=	${.CURDIR}/${RTLD_ARCH}/Sy
 # 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}
+	-chflags -h noschg ${DESTDIR}/usr/libexec/${PROG}
 .endif
 
 .PATH: ${.CURDIR}/${RTLD_ARCH}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212041436.qB4Ea12G010817>