diff options
| author | ed <ed@FreeBSD.org> | 2011-10-26 07:49:47 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2011-10-26 07:49:47 +0000 |
| commit | f206af6376a4a354eb147844dcaad8a6343b9b91 (patch) | |
| tree | 0123271aa8f07e161bde33f5aa9a861f4ea9e9f9 /Makefile.inc1 | |
| parent | fb5f47d254fc4d1fb1cd611706bdfab3515ff8e6 (diff) | |
| download | FreeBSD-src-f206af6376a4a354eb147844dcaad8a6343b9b91.zip FreeBSD-src-f206af6376a4a354eb147844dcaad8a6343b9b91.tar.gz | |
Attempt to fix build logic for gensnmptree.
There are two problems with the existing logic. It builds gensnmptree
on <700018, even if WITHOUT_BSNMP is set, but more importantly, we must
not forget to build gensnmptree on systems that have originally been
built without. This causes a buildworld on those systems to fail.
MFC after: 1 week
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index d0be65b..07e4301 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1018,7 +1018,8 @@ _yacc= usr.bin/yacc _awk= usr.bin/awk .endif -.if ${BOOTSTRAPPING} < 700018 +.if ${MK_BSNMP} != "no" && \ + (${BOOTSTRAPPING} < 700018 || !exists(/usr/sbin/gensnmptree)) _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif |
