diff options
| author | Ed Schouten <ed@FreeBSD.org> | 2011-10-26 07:49:47 +0000 |
|---|---|---|
| committer | Ed Schouten <ed@FreeBSD.org> | 2011-10-26 07:49:47 +0000 |
| commit | 653eeb7f5ed7325491667dc76c332c044947fccd (patch) | |
| tree | 0123271aa8f07e161bde33f5aa9a861f4ea9e9f9 /Makefile.inc1 | |
| parent | 0321b694c7854579f4d21498c53d0f6381200703 (diff) | |
| download | src-653eeb7f5ed7325491667dc76c332c044947fccd.tar.gz src-653eeb7f5ed7325491667dc76c332c044947fccd.zip | |
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
Notes
Notes:
svn path=/head/; revision=226785
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 d0be65b76f06..07e43018852d 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 |