svn commit: r230951 - stable/9

[Ed Schouten]

Author: ed
Date: Fri Feb  3 17:36:32 2012
New Revision: 230951
URL: http://svn.freebsd.org/changeset/base/230951

Log:
  MFC r226785:
  
    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.

Modified:
  stable/9/Makefile.inc1   (contents, props changed)
Directory Properties:
  stable/9/   (props changed)

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Fri Feb  3 15:39:13 2012	(r230950)
+++ stable/9/Makefile.inc1	Fri Feb  3 17:36:32 2012	(r230951)
@@ -1029,7 +1029,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