diff options
| author | jlam <jlam@pkgsrc.org> | 2007-07-12 18:59:15 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-07-12 18:59:15 +0000 |
| commit | 13ed6251ebb031b4bc59db8137bf4db251e53a86 (patch) | |
| tree | 6b31726dad0aad10534bd10b311c46c86ca9ded5 /mk/configure/configure.mk | |
| parent | 032306f2fabf94e09615ab96e52591cdf04f29a3 (diff) | |
| download | pkgsrc-13ed6251ebb031b4bc59db8137bf4db251e53a86.tar.gz | |
No longer pass install_sh in the environment to GNU configure scripts.
We fix GNU configure script stupidity by directly replacing the stock
install-sh script provided by the software with the BSD install-compatible
sysutils/install-sh script.
A new package-settable variable comes to life:
INSTALL_SH_OVERRIDE is a list of files relative to WRKSRC which
should be overridden by the install-sh script from
sysutils/install-sh. If not defined or set to "no", then
no files are overridden.
Possible values: no, defined, undefined.
Default value: defined when GNU_CONFIGURE is defined, undefined
otherwise.
Get rid of the install_sh tool, which is no longer needed.
Diffstat (limited to 'mk/configure/configure.mk')
| -rw-r--r-- | mk/configure/configure.mk | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/mk/configure/configure.mk b/mk/configure/configure.mk index 4166ba62f7e..3853dfb3616 100644 --- a/mk/configure/configure.mk +++ b/mk/configure/configure.mk @@ -1,4 +1,4 @@ -# $NetBSD: configure.mk,v 1.17 2007/03/15 22:54:24 rillig Exp $ +# $NetBSD: configure.mk,v 1.18 2007/07/12 18:59:15 jlam Exp $ # # = Package-settable variables = # @@ -16,6 +16,16 @@ # CONFIGURE_ARGS is the list of arguments that is passed to the # configure script. # +# INSTALL_SH_OVERRIDE is a list of files relative to WRKSRC which +# should be overridden by the install-sh script from +# sysutils/install-sh. If not defined or set to "no", then +# no files are overridden. +# +# Possible values: no, defined, undefined. +# +# Default value: defined when GNU_CONFIGURE is defined, undefined +# otherwise. +# # OVERRIDE_GNU_CONFIG_SCRIPTS # Whether to override the GNU config.guess and config.sub scripts # with the pkgsrc versions. @@ -53,6 +63,9 @@ _BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_ARGS .if defined(OVERRIDE_GNU_CONFIG_SCRIPTS) . include "${PKGSRCDIR}/mk/configure/config-override.mk" .endif +.if defined(INSTALL_SH_OVERRIDE) && empty(INSTALL_SH_OVERRIDE:M[Nn][Oo]) +. include "${PKGSRCDIR}/mk/configure/install-sh-override.mk" +.endif .if defined(USE_LIBTOOL) . include "${PKGSRCDIR}/mk/configure/libtool-override.mk" .endif |