From f75176b39cb7d35a6a241e5e0a0e934d21742e72 Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 9 Oct 2006 12:52:34 +0000 Subject: Flag a number of packages I use as supporting (user-)destdir. apg is a bit special as it has some hardcoded ownership, so mark that as "destdir". --- x11/xorg-libs/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'x11/xorg-libs') diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile index 7fed7fb26a1..31977d49a7a 100644 --- a/x11/xorg-libs/Makefile +++ b/x11/xorg-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2006/09/14 17:13:58 joerg Exp $ +# $NetBSD: Makefile,v 1.45 2006/10/09 12:52:36 joerg Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-libs-${XORG_VER} @@ -13,6 +13,7 @@ HOMEPAGE= http://www.x.org/ COMMENT= X.org Libraries BUILD_DEPENDS= xorg-imake-[0-9]*:../../x11/xorg-imake +PKG_DESTDIR_SUPPORT= user-destdir .include "../../mk/bsd.prefs.mk" @@ -35,6 +36,8 @@ CONFLICTS+= libX11-[0-9]* CONFLICTS+= libXau-[0-9]* .endif +INSTALLATION_DIRS+= ${X11BASE}/lib/pkgconfig + BUILDLINK_PASSTHRU_DIRS+= ${X11ROOT}/lib XBUILD_DIRS= lib nls programs/Xserver/include \ @@ -51,19 +54,16 @@ SUBST_MESSAGE.mkstrs= Fixing path of makestrs. post-install: @${SED} ${XORG_PLIST_SED} ${PKGDIR}/PLIST > ${PLIST_SRC} -.if ${OPSYS} == "Linux" - @${LDCONFIG} ${X11ROOT}/lib || ${TRUE} -.endif pre-install: .if !exists(${X11BASE}/lib/pkgconfig) - ${INSTALL_DATA_DIR} ${X11BASE}/lib/pkgconfig + ${INSTALL_DATA_DIR} ${DESTDIR}${X11BASE}/lib/pkgconfig .endif .for f in render.pc fixesext.pc compositeext.pc @${SED} -e "s,@X11BASE@,${X11BASE},g" \ -e "s,@LOCALBASE@,${LOCALBASE},g" \ ${FILESDIR}/${f} > ${WRKSRC}/${f} - ${INSTALL_DATA} ${WRKSRC}/${f} ${X11BASE}/lib/pkgconfig/${f} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${X11BASE}/lib/pkgconfig/${f} .endfor .include "../../devel/zlib/buildlink3.mk" -- cgit v1.2.3