From 4370e41b8a0ef38ab0fc09c8e7b2b6336f423b38 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Mon, 4 Jun 2007 12:10:20 +0000
Subject: For GNU-style configure scripts, the environment variable install_sh
 must point to a shell script (as the name implies), not to a binary.

---
 mk/configure/bsd.configure-vars.mk | 7 ++++++-
 mk/configure/gnu-configure.mk      | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'mk/configure')

diff --git a/mk/configure/bsd.configure-vars.mk b/mk/configure/bsd.configure-vars.mk
index 5167a83f0b5..dd3914ce02d 100644
--- a/mk/configure/bsd.configure-vars.mk
+++ b/mk/configure/bsd.configure-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.configure-vars.mk,v 1.2 2007/03/01 18:30:36 wiz Exp $
+# $NetBSD: bsd.configure-vars.mk,v 1.3 2007/06/04 12:10:20 rillig Exp $
 #
 # CONFIGURE_DIRS is the list of directories in which to run the
 #	configure process.  If the directories are relative paths,
@@ -25,3 +25,8 @@ SCRIPTS_ENV+=	VIEWBASE=${VIEWBASE}
 SCRIPTS_ENV+=	WRKDIR=${WRKDIR}
 SCRIPTS_ENV+=	WRKSRC=${WRKSRC}
 SCRIPTS_ENV+=	X11BASE=${X11BASE}
+
+.if defined(GNU_CONFIGURE)
+TOOLS_CREATE+=	install_sh
+TOOLS_SCRIPT.install_sh=	${INSTALL} "$$@"
+.endif
diff --git a/mk/configure/gnu-configure.mk b/mk/configure/gnu-configure.mk
index a38eb063045..a70862a343c 100644
--- a/mk/configure/gnu-configure.mk
+++ b/mk/configure/gnu-configure.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gnu-configure.mk,v 1.3 2007/03/15 22:54:24 rillig Exp $
+# $NetBSD: gnu-configure.mk,v 1.4 2007/06/04 12:10:20 rillig Exp $
 
 _VARGROUPS+=			gnu-configure
 _USER_VARS.gnu-configure=	# none
@@ -12,7 +12,7 @@ OVERRIDE_GNU_CONFIG_SCRIPTS=	defined
 
 CONFIGURE_ENV+=	CONFIG_SHELL=${CONFIG_SHELL:Q}
 CONFIGURE_ENV+=	LIBS=${LIBS:M*:Q}
-CONFIGURE_ENV+=	install_sh=${INSTALL:Q}
+CONFIGURE_ENV+=	install_sh=${TOOLS_CMD.install_sh:Q}
 CONFIGURE_ENV+=	ac_given_INSTALL=${INSTALL:Q}\ -c\ -o\ ${BINOWN}\ -g\ ${BINGRP}
 
 .if (defined(USE_LIBTOOL) || !empty(PKGPATH:Mdevel/libtool-base)) && \
-- 
cgit v1.2.3