diff options
author | sbd <sbd@pkgsrc.org> | 2012-01-01 04:22:03 +0000 |
---|---|---|
committer | sbd <sbd@pkgsrc.org> | 2012-01-01 04:22:03 +0000 |
commit | aaef9a1b893d44644117b4b65a8cc131cf933181 (patch) | |
tree | a70ea134f47d3d0bd86482be6fbcbf10bff8f6a0 /databases | |
parent | 67e0ced4788ed0a7803749c0813001d2115ae84e (diff) | |
download | pkgsrc-aaef9a1b893d44644117b4b65a8cc131cf933181.tar.gz |
Include databases/gdbm/builtin.mk earlier to stop malformed conditional
errors because of USE_BUILTIN.gdbm usage.
Diffstat (limited to 'databases')
-rw-r--r-- | databases/gdbm_compat/builtin.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/databases/gdbm_compat/builtin.mk b/databases/gdbm_compat/builtin.mk index 3185fbcba5d..1941c5a30b9 100644 --- a/databases/gdbm_compat/builtin.mk +++ b/databases/gdbm_compat/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2011/12/03 08:44:21 sbd Exp $ +# $NetBSD: builtin.mk,v 1.2 2012/01/01 04:22:03 sbd Exp $ BUILTIN_PKG:= gdbm_compat BUILTIN_FIND_FILES_VAR= NDBM_H @@ -19,13 +19,19 @@ IS_BUILTIN.gdbm_compat= yes .endif MAKEVARS+= IS_BUILTIN.gdbm_compat +## +## Include databases/gdbm/builtin.mk so that BUILTIN_PKG.gdbm and +## USE_BUILTIN.gdbm are set. +.if !defined(BUILTIN_PKG.gdbm) || !defined(USE_BUILTIN.gdbm) +. include "../../databases/gdbm/builtin.mk" +.endif + ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to ### a package name to represent the built-in package. ### .if !defined(BUILTIN_PKG.gdbm_compat) && \ !empty(IS_BUILTIN.gdbm_compat:M[yY][eE][sS]) -.include "../../databases/gdbm/builtin.mk" BUILTIN_PKG.gdbm_compat:= ${BUILTIN_PKG.gdbm:S/gdbm-/gdbm_compat-/} .endif MAKEVARS+= BUILTIN_PKG.gdbm_compat |