diff options
| author | rillig <rillig@pkgsrc.org> | 2006-07-15 23:58:52 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-07-15 23:58:52 +0000 |
| commit | 222182789245b6c9f6c8cff1c0c35283bc1cba4d (patch) | |
| tree | a4b93f8fac3a6f560860ad528f5b8c399b8d67b1 /mk/configure | |
| parent | 0666bf8a6bfe69284c2b32f1fc53121b284bc10a (diff) | |
| download | pkgsrc-222182789245b6c9f6c8cff1c0c35283bc1cba4d.tar.gz | |
Split the variable BUILD_DEFS into those that are defined by packages
and those that are defined by the infrastructure (_BUILD_DEFS). This
allows the build-defs-message target to be moved to the end of
bsd.pkg.mk. Now it prints the correct result even in unprivileged
builds, which had been wrong due to the order in which the files have
been included. For example, ${UNPRIVILEGED_USER} was displayed as (not
defined) although its value was defined, which could be checked with
"bmake show-var".
Tested with one package that _does_ define BUILD_DEFS and with one that
doesn't. The behavior stays the same.
Diffstat (limited to 'mk/configure')
| -rw-r--r-- | mk/configure/configure.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/configure/configure.mk b/mk/configure/configure.mk index d7ead1ea5fd..832368212bc 100644 --- a/mk/configure/configure.mk +++ b/mk/configure/configure.mk @@ -1,4 +1,4 @@ -# $NetBSD: configure.mk,v 1.5 2006/07/15 09:52:00 rillig Exp $ +# $NetBSD: configure.mk,v 1.6 2006/07/15 23:58:52 rillig Exp $ # # CONFIGURE_SCRIPT is the path to the script to run in order to # configure the software for building. If the path is relative, @@ -14,7 +14,7 @@ CONFIGURE_SCRIPT?= ./configure CONFIGURE_ENV+= ${ALL_ENV} CONFIGURE_ARGS?= # empty -BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_ARGS +_BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_ARGS .if defined(GNU_CONFIGURE) . include "${PKGSRCDIR}/mk/configure/gnu-configure.mk" |