From 6c6c9ae2def2636f80420e7d781b35e1d7e4a46f Mon Sep 17 00:00:00 2001
From: mef <mef@pkgsrc.org>
Date: Thu, 23 Oct 2014 10:25:11 +0000
Subject: Use CONFIG_SHELL instead of PKGSRC_MAKE_ENV, thanks wiz@

---
 cross/avr-binutils/Makefile   | 12 ++++--------
 cross/nios2-binutils/Makefile | 12 ++++--------
 2 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'cross')

diff --git a/cross/avr-binutils/Makefile b/cross/avr-binutils/Makefile
index 1a1f6471647..37738ca2b50 100644
--- a/cross/avr-binutils/Makefile
+++ b/cross/avr-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2014/06/15 15:54:41 mef Exp $
+# $NetBSD: Makefile,v 1.25 2014/10/23 10:25:11 mef Exp $
 
 DISTNAME=		binutils-2.24
 PKGNAME=		${DISTNAME:S/^/avr-/}
@@ -16,6 +16,9 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GNU_CONFIGURE_HOST=	no
+# ./configure.lineno: 3239: Syntax error: Missing '}'
+# Makefile:2991: recipe for target 'configure-opcodes' failed
+CONFIG_SHELL=		ksh
 
 CONFIGURE_ARGS+=	--disable-werror --target=avr --disable-nls
 
@@ -52,10 +55,3 @@ post-install:
 	done;	\
 	)
 .include "../../mk/bsd.pkg.mk"
-
-# ./configure.lineno: 3239: Syntax error: Missing '}'
-# Makefile:2991: recipe for target 'configure-opcodes' failed
-# gmake[1]: *** [configure-opcodes] Error 1
-# gmake[1]: Leaving directory 'cross/avr-binutils/work/binutils-2.24'
-# see avr-binutils
-PKGSRC_MAKE_ENV+=       SH=/bin/ksh
diff --git a/cross/nios2-binutils/Makefile b/cross/nios2-binutils/Makefile
index f31cf6e9716..e1898ed8363 100644
--- a/cross/nios2-binutils/Makefile
+++ b/cross/nios2-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/09/10 12:12:03 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2014/10/23 10:30:10 mef Exp $
 
 DISTNAME=		binutils-2.24
 PKGNAME=		${DISTNAME:S/^/nios2-/}
@@ -20,6 +20,9 @@ GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GNU_CONFIGURE_HOST=	no
 INFO_FILES=		# empty
+# ./configure.lineno: 3239: Syntax error: Missing '}'
+# Makefile:2991: recipe for target 'configure-opcodes' failed
+CONFIG_SHELL=		ksh
 
 NIOS2_TARGET=		nios2-elf
 CONFIGURE_ARGS+=	--disable-werror --target=${NIOS2_TARGET} --disable-nls
@@ -36,10 +39,3 @@ post-install:
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-
-# ./configure.lineno: 3239: Syntax error: Missing '}'
-# Makefile:2991: recipe for target 'configure-opcodes' failed
-# gmake[1]: *** [configure-opcodes] Error 1
-# gmake[1]: Leaving directory '/export/WRKOBJDIR/wip/avr-binutils/work/binutils-2.24'
-# see avr-binutils
-PKGSRC_MAKE_ENV+=	SH=/bin/ksh
-- 
cgit v1.2.3