diff options
| author | ngie <ngie@FreeBSD.org> | 2014-08-29 18:26:55 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2014-08-29 18:26:55 +0000 |
| commit | f4fd8ca123dc4ee8f99360e00b5196f563d90a41 (patch) | |
| tree | 7f9427978429216cd043706e67d1ab6e5c7951fb /Makefile.inc1 | |
| parent | 29ecd8ce13d5ce74b4267865ba5b14edb1b04597 (diff) | |
| download | FreeBSD-src-f4fd8ca123dc4ee8f99360e00b5196f563d90a41.zip FreeBSD-src-f4fd8ca123dc4ee8f99360e00b5196f563d90a41.tar.gz | |
MFC r270027:
tmconfig compilation when MK_ATM == yes and MK_BSNMP == no
Makefile.inc1:
Always compile gensnmptree with bootstrap-tools when MK_BSNMP != no
instead of depending on a potentially stale tool installed on the build host
sbin/atm/atmconfig/Makefile:
- Always remove oid.h to avoid cluttering up the build/src tree.
- Consolidate all of the RESCUE/MK_BSNMP != no logic under one
conditional to improve readability
- Remove unnecessary ${.OBJDIR} prefixing for oid.h and use ${.TARGET} instead
of spelling out oid.h
- Add a missing DPADD for ${LIBCRYPTO} when compiled MK_BSNMP == yes and
MK_OPENSSL == yes and not compiling for /rescue/rescue
sbin/atm/atmconfig/main.c:
Change #ifndef RESCUE to #ifdef WITH_BSNMP in main.c to make it
clear that we're compiling bsnmp support into atmconfig
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 0322186..67bd16a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1257,7 +1257,7 @@ _lex= usr.bin/lex _awk= usr.bin/awk .endif -.if ${MK_BSNMP} != "no" && !exists(/usr/sbin/gensnmptree) +.if ${MK_BSNMP} != "no" _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif |
