diff options
| author | jlam <jlam@pkgsrc.org> | 2002-11-26 08:59:04 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-11-26 08:59:04 +0000 |
| commit | df1f4c5ddd2e61ac99b9e8dd6505b3c8a0a987fe (patch) | |
| tree | f045a5f7084ab2901f4a80b2a49c1ce234014525 /mk/buildlink2 | |
| parent | 462086f7c036f9657fd8719238d0fb5d27e23e9c (diff) | |
| download | pkgsrc-df1f4c5ddd2e61ac99b9e8dd6505b3c8a0a987fe.tar.gz | |
Restore usual meaning for AUTOMAKE_OVERRIDE so that it works even if
USE_BUILDLINK2 is defined. AUTOMAKE_OVERRIDE == "yes" is the default, and
means that pkgsrc will try to avoid executing the GNU autotools during the
build process. Setting AUTOMAKE_OVERRIDE to "no" will avoid these extra
steps by pkgsrc, so that the GNU autotools will be automatically invoked
if they are found (though they may not necessarily invoke the correct ones
and the effects may be surprising...do this only if you know what you are
doing).
Diffstat (limited to 'mk/buildlink2')
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index 9c4c89a0ba4..5859311f5db 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.55 2002/11/25 19:32:47 jlam Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.56 2002/11/26 08:59:06 jlam Exp $ # # An example package buildlink2.mk file: # @@ -858,7 +858,7 @@ buildlink-check: # status for each of the GNU auto* tools, which should cause GNU configure # scripts to think that they can't be found. # -AUTOMAKE_OVERRIDE?= NO +AUTOMAKE_OVERRIDE?= yes _GNU_MISSING= ${.CURDIR}/../../mk/gnu-config/missing _HIDE_PROGS.autoconf= bin/autoconf bin/autoconf-2.13 \ bin/autoheader bin/autoheader-2.13 \ @@ -876,7 +876,10 @@ _HIDE_PROGS.automake= bin/aclocal bin/aclocal-1.4 \ bin/automake-1.6 \ bin/automake-1.7 +.if empty(AUTOMAKE_OVERRIDE:M[nN][oO]) do-buildlink: hide-autotools +.endif + hide-autotools: # empty .for _autotool_ in autoconf automake |