- DESTDIR support

- simplified Makefile of wxGTK-contrib using BUILD_DIRS
- don't include x11.b3.mk as it is not needed

3 files changed, 8 insertions, 11 deletions

diff --git a/x11/wxGTK-contrib/Makefile b/x11/wxGTK-contrib/Makefile
index 0f3d34effdc..458c1643ab5 100644
--- a/x11/wxGTK-contrib/Makefile
+++ b/x11/wxGTK-contrib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/04/17 13:46:00 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/02 11:00:25 joerg Exp $
 #
 
 .include "../../x11/wxGTK/Makefile.common"
@@ -10,11 +10,7 @@ COMMENT=		GTK-based implementation of the wxWidgets GUI library (contrib librari
 
 USE_TOOLS+=		gmake
 
-do-build:
-	cd ${WRKSRC}/contrib/src && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS}
-
-do-install:
-	cd ${WRKSRC}/contrib/src && ${SETENV} ${MAKE_ENV} ${MAKE} install ${MAKE_FLAGS}
+BUILD_DIRS=		contrib/src
 
 .include "../../x11/wxGTK/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index fe6d69151ba..6673bfee435 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/04/17 14:52:12 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2007/01/02 11:00:24 joerg Exp $
 #
 
 .include "Makefile.common"
@@ -18,8 +18,8 @@ post-build:
 	done
 
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DOCDIR}/LICENSE
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DESTDIR}${DOCDIR}/LICENSE
 
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/x11/wxGTK/Makefile.common b/x11/wxGTK/Makefile.common
index 4c5d0bed613..6340ec236f6 100644
--- a/x11/wxGTK/Makefile.common
+++ b/x11/wxGTK/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2006/12/05 08:30:20 joerg Exp $
+# $NetBSD: Makefile.common,v 1.13 2007/01/02 11:00:24 joerg Exp $
 #
 
 DISTNAME=		wxGTK-2.6.3
@@ -15,6 +15,8 @@ DISTINFO_FILE=		${.CURDIR}/../../x11/wxGTK/distinfo
 PATCHFILES=		${DISTNAME}-libtool.diff2.bz2
 PATCH_SITES=		${MASTER_SITE_LOCAL}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		pkg-config msgfmt
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	YES
@@ -54,4 +56,3 @@ USE_TOOLS+=		gawk:pkgsrc
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"