[pkgsrc/trunk]: pkgsrc/mk/configure For GNU-style configure scripts, the envi...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4d9c9a887c3f
branches:  trunk
changeset: 529426:4d9c9a887c3f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Jun 04 12:10:20 2007 +0000

description:
For GNU-style configure scripts, the environment variable install_sh
must point to a shell script (as the name implies), not to a binary.

diffstat:

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

diffs (36 lines):

diff -r cbc0468027eb -r 4d9c9a887c3f mk/configure/bsd.configure-vars.mk
--- a/mk/configure/bsd.configure-vars.mk        Mon Jun 04 08:49:18 2007 +0000
+++ b/mk/configure/bsd.configure-vars.mk        Mon Jun 04 12:10:20 2007 +0000
@@ -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+=  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 -r cbc0468027eb -r 4d9c9a887c3f mk/configure/gnu-configure.mk
--- a/mk/configure/gnu-configure.mk     Mon Jun 04 08:49:18 2007 +0000
+++ b/mk/configure/gnu-configure.mk     Mon Jun 04 12:10:20 2007 +0000
@@ -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 @@
 
 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)) && \