From owner-svn-src-all@FreeBSD.ORG  Tue May  7 22:05:58 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 779D9735;
 Tue,  7 May 2013 22:05:58 +0000 (UTC)
 (envelope-from brooks@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 6A72C607;
 Tue,  7 May 2013 22:05:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r47M5wI4095133;
 Tue, 7 May 2013 22:05:58 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r47M5wYq095132;
 Tue, 7 May 2013 22:05:58 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201305072205.r47M5wYq095132@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 7 May 2013 22:05:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250337 - head/cddl/lib/drti
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: Tue, 07 May 2013 22:05:58 -0000

Author: brooks
Date: Tue May  7 22:05:57 2013
New Revision: 250337
URL: http://svnweb.freebsd.org/changeset/base/250337

Log:
  Work around the implementation of LIBRARIES_ONLY.  It causes drti.o to
  not be installed in /usr/lib32 on systems with compat-32 support.
  
  This fix has two parts.  First, the build is forced by linking drti.o
  into a dummy internal library.  Second, the object file is installed
  manually in the LIBRARIES_ONLY case.
  
  MFC after:	3 days

Modified:
  head/cddl/lib/drti/Makefile

Modified: head/cddl/lib/drti/Makefile
==============================================================================
--- head/cddl/lib/drti/Makefile	Tue May  7 22:05:15 2013	(r250336)
+++ head/cddl/lib/drti/Makefile	Tue May  7 22:05:57 2013	(r250337)
@@ -9,6 +9,8 @@ FILESGRP=	${LIBGRP}
 FILESMODE=	${LIBMODE}
 FILESDIR=	${LIBDIR}/dtrace
 CLEANFILES=	${FILES}
+LIB=		drti-dummy
+INTERNALLIB=
 
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
@@ -18,4 +20,10 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
 		-DPIC ${PICFLAG}
 
+.if make(install) && defined(LIBRARIES_ONLY)
+install:
+	${INSTALL} -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \
+	    ${FILES} ${DESTDIR}${FILESDIR}
+.endif
+
 .include <bsd.lib.mk>