diff options
| author | rillig <rillig@pkgsrc.org> | 2007-03-15 11:20:40 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-03-15 11:20:40 +0000 |
| commit | 1de2f00cdaef47f9d601508012ac614061a4cd24 (patch) | |
| tree | 4d7831014fc7d08aa9f5dd723dde8917f29773b1 /mk | |
| parent | 5a7bce0e5e1ce28402d9977d5f035e92b7a1f8e7 (diff) | |
| download | pkgsrc-1de2f00cdaef47f9d601508012ac614061a4cd24.tar.gz | |
Moved the definition of CONFIG_SHELL from gnu-configure.mk to configure.mk.
Improved the documentation.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/configure/configure.mk | 14 | ||||
| -rw-r--r-- | mk/configure/gnu-configure.mk | 3 |
2 files changed, 11 insertions, 6 deletions
diff --git a/mk/configure/configure.mk b/mk/configure/configure.mk index 806d4a0feb9..48364f2b907 100644 --- a/mk/configure/configure.mk +++ b/mk/configure/configure.mk @@ -1,13 +1,18 @@ -# $NetBSD: configure.mk,v 1.15 2007/03/07 01:27:27 rillig Exp $ +# $NetBSD: configure.mk,v 1.16 2007/03/15 11:20:40 rillig Exp $ +# +# = Package-settable variables = +# +# CONFIGURE_ENV is the shell environment that is exported to the +# configure script. +# +# CONFIG_SHELL is the shell that is used for interpreting the +# configure script. # # CONFIGURE_SCRIPT is the path to the script to run in order to # configure the software for building. If the path is relative, # then it is assumed to be relative to each directory listed in # CONFIGURE_DIRS. # -# CONFIGURE_ENV is the shell environment that is exported to the -# configure script. -# # CONFIGURE_ARGS is the list of arguments that is passed to the # configure script. # @@ -32,6 +37,7 @@ CONFIGURE_SCRIPT?= ./configure CONFIGURE_ENV+= ${ALL_ENV} CONFIGURE_ARGS?= # empty +CONFIG_SHELL?= ${SH} CONFIG_SHELL_FLAGS?= # none _BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_ARGS diff --git a/mk/configure/gnu-configure.mk b/mk/configure/gnu-configure.mk index bcf15bc5c1a..1af69305ba3 100644 --- a/mk/configure/gnu-configure.mk +++ b/mk/configure/gnu-configure.mk @@ -1,9 +1,8 @@ -# $NetBSD: gnu-configure.mk,v 1.1 2006/07/05 06:09:15 jlam Exp $ +# $NetBSD: gnu-configure.mk,v 1.2 2007/03/15 11:20:40 rillig Exp $ HAS_CONFIGURE= defined OVERRIDE_GNU_CONFIG_SCRIPTS= defined -CONFIG_SHELL?= ${SH} CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL:Q} CONFIGURE_ENV+= LIBS=${LIBS:M*:Q} CONFIGURE_ENV+= install_sh=${INSTALL:Q} |