From dda6e068736ebb6565141c87715edf0526db5390 Mon Sep 17 00:00:00 2001
From: brooks <brooks@FreeBSD.org>
Date: Tue, 7 May 2013 22:05:57 +0000
Subject: 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
---
 cddl/lib/drti/Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'cddl/lib')

diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile
index 6e3d3a6..c715809 100644
--- a/cddl/lib/drti/Makefile
+++ b/cddl/lib/drti/Makefile
@@ -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/compat/opensolaris \
 		-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>
-- 
cgit v1.1