From a1c8784e55dff25d4811440423abae7f2e911d21 Mon Sep 17 00:00:00 2001
From: obache <obache>
Date: Sat, 12 Dec 2009 05:02:19 +0000
Subject: some improvement * Remove BUILD_DEPENDS on bison, it already in
 USE_TOOLS. * Remove USE_BZIP2, not buildlink with bzip2, no effect. * Remove
 custom do-* target, *_DIRS is sufficient to do so and use it instead. *
 Remove MAKE_FLAGS="c c++", it was not used, and it result in missing "gcov"  
 after above modification. * then, add user-destdir support, inspired by PR
 42438.

---
 cross/avr-gcc/Makefile | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'cross/avr-gcc')

diff --git a/cross/avr-gcc/Makefile b/cross/avr-gcc/Makefile
index 9633e382066..c716566fdc6 100644
--- a/cross/avr-gcc/Makefile
+++ b/cross/avr-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/08/27 15:29:37 hasso Exp $
+# $NetBSD: Makefile,v 1.22 2009/12/12 05:02:19 obache Exp $
 
 DISTNAME=		gcc-4.4.1
 PKGNAME=		avr-gcc-4.4.1
@@ -11,19 +11,18 @@ DISTFILES=		${DISTNAME:S/-/-core-/}${EXTRACT_SUFX} \
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		GNU gcc-4.4 for Atmel AVR 8-bit RISC microcontrollers
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		avr-binutils-[0-9]*:../../cross/avr-binutils
 BUILD_DEPENDS+=		autoconf-[0-9]*:../../devel/autoconf
-BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
 GNU_CONFIGURE=		yes
-USE_BZIP2=		yes
 USE_TOOLS+=		bison gmake lex perl tar msgfmt
 USE_PKGLOCALEDIR=	yes
 USE_GNU_CONFIGURE_HOST=	no
 
 CONFIGURE_ARGS+=	--target=avr --disable-nls
 
-MAKE_FLAGS+=		LANGUAGES="c c++"
 MAKE_ENV+=		MACHINE_ARCH=avr
 MAKE_ENV+=		SHELL=${CONFIG_SHELL}
 CFLAGS_FOR_BUILD:=	${CFLAGS}
@@ -38,16 +37,13 @@ SUBST_FILES.sed=	fixincludes/fixincl.x
 SUBST_SED.sed=		-e 's|@SED@|${TOOLS_PATH.sed}|g'
 SUBST_STAGE.sed=	post-patch
 
-
-do-configure:
+pre-configure:
 	${MKDIR} ${WRKDIR}/obj
-	cd ${WRKDIR}/obj; ${SETENV} ${CONFIGURE_ENV} ${CONFIG_SHELL} ${WRKSRC}/configure ${CONFIGURE_ARGS}
 
-do-build:
-	(${_ULIMIT_CMD} cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS:U1} )
+CONFIGURE_DIRS=		${WRKDIR}/obj
+CONFIGURE_SCRIPT=	${WRKSRC}/configure
 
-do-install:
-	cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} install
+INSTALLATION_DIRS+=	avr/bin
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../math/mpfr/buildlink3.mk"
-- 
cgit v1.2.3