From owner-svn-src-all@FreeBSD.ORG  Sun Jun 16 16:29:24 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 6ACDF342;
 Sun, 16 Jun 2013 16:29:24 +0000 (UTC) (envelope-from jlh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5C9C61E71;
 Sun, 16 Jun 2013 16:29:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5GGTOoT090933;
 Sun, 16 Jun 2013 16:29:24 GMT (envelope-from jlh@svn.freebsd.org)
Received: (from jlh@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5GGTOK9090932;
 Sun, 16 Jun 2013 16:29:24 GMT (envelope-from jlh@svn.freebsd.org)
Message-Id: <201306161629.r5GGTOK9090932@svn.freebsd.org>
From: Jeremie Le Hen <jlh@FreeBSD.org>
Date: Sun, 16 Jun 2013 16:29:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251810 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Jun 2013 16:29:24 -0000

Author: jlh
Date: Sun Jun 16 16:29:23 2013
New Revision: 251810
URL: http://svnweb.freebsd.org/changeset/base/251810

Log:
  Fix install from read-only obj dir when SHLIB_LDSCRIPT is used.
  
  Reported by:    joeld
  Tested by:      joeld

Modified:
  head/share/mk/bsd.lib.mk

Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk	Sun Jun 16 16:10:45 2013	(r251809)
+++ head/share/mk/bsd.lib.mk	Sun Jun 16 16:29:23 2013	(r251810)
@@ -330,9 +330,12 @@ _libinstall:
 .if defined(SHLIB_LDSCRIPT) && !empty(SHLIB_LDSCRIPT) && exists(${.CURDIR}/${SHLIB_LDSCRIPT})
 	sed -e 's,@@SHLIB@@,${_LDSCRIPTROOT}${SHLIBDIR}/${SHLIB_NAME},g' \
 	    -e 's,@@LIBDIR@@,${_LDSCRIPTROOT}${LIBDIR},g' \
-	    ${.CURDIR}/${SHLIB_LDSCRIPT} > lib${LIB}.ld
+	    ${.CURDIR}/${SHLIB_LDSCRIPT} > ${DESTDIR}${LIBDIR}/${SHLIB_LINK:R}.ld
 	${INSTALL} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-	    ${_INSTALLFLAGS} lib${LIB}.ld ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
+	    ${_INSTALLFLAGS} ${DESTDIR}${LIBDIR}/${SHLIB_LINK:R}.ld \
+	    ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
+	rm -f ${DESTDIR}${LIBDIR}/${SHLIB_LINK:R}.ld
+
 .else
 .if ${SHLIBDIR} == ${LIBDIR}
 	${INSTALL_SYMLINK} ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}