From 9bba371fbf641048af4891be05863c4e383344d3 Mon Sep 17 00:00:00 2001 From: Hartmut Brandt Date: Mon, 10 Nov 2003 13:43:26 +0000 Subject: [PATCH] Fix the build by adjusting the include directives. The problem was that the sources use "..." includes to get at include files that later on reside in an include sub-directory. --- lib/libbsnmp/modules/snmp_mibII/Makefile | 6 +++--- lib/libbsnmp/modules/snmp_netgraph/Makefile | 4 +++- usr.sbin/bsnmpd/modules/snmp_mibII/Makefile | 6 +++--- usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile | 4 +++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/libbsnmp/modules/snmp_mibII/Makefile b/lib/libbsnmp/modules/snmp_mibII/Makefile index 7fa524a93c81..4c8c0c1672b1 100644 --- a/lib/libbsnmp/modules/snmp_mibII/Makefile +++ b/lib/libbsnmp/modules/snmp_mibII/Makefile @@ -2,8 +2,8 @@ # # Author: Harti Brandt -CONTRIB=${.CURDIR}/../../../../contrib/bsnmp/snmp_mibII -.PATH: ${CONTRIB} +CONTRIB=${.CURDIR}/../../../../contrib/bsnmp +.PATH: ${CONTRIB}/snmp_mibII MOD= mibII SRCS= mibII.c mibII_ifmib.c mibII_ip.c mibII_interfaces.c \ @@ -14,6 +14,6 @@ MAN= snmp_mibII.3 DEFS= ${MOD}_tree.def INCS= snmp_${MOD}.h -CFLAGS+= -I${INCLUDEDIR}/bsnmp -I${.CURDIR} +CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I${.CURDIR} .include diff --git a/lib/libbsnmp/modules/snmp_netgraph/Makefile b/lib/libbsnmp/modules/snmp_netgraph/Makefile index 6ccdf5f40f65..b101b3806019 100644 --- a/lib/libbsnmp/modules/snmp_netgraph/Makefile +++ b/lib/libbsnmp/modules/snmp_netgraph/Makefile @@ -2,6 +2,8 @@ # # Author: Harti Brandt +CONTRIB=${.CURDIR}/../../../../contrib/bsnmp + MOD= netgraph SRCS= snmp_netgraph.c MAN= snmp_netgraph.3 @@ -10,6 +12,6 @@ MIBS= BEGEMOT-NETGRAPH.txt DEFS= ${MOD}_tree.def INCS= snmp_${MOD}.h -CFLAGS+= -I${INCLUDEDIR}/bsnmp -I${.CURDIR} +CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I${.CURDIR} .include diff --git a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile index 7fa524a93c81..4c8c0c1672b1 100644 --- a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile +++ b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile @@ -2,8 +2,8 @@ # # Author: Harti Brandt -CONTRIB=${.CURDIR}/../../../../contrib/bsnmp/snmp_mibII -.PATH: ${CONTRIB} +CONTRIB=${.CURDIR}/../../../../contrib/bsnmp +.PATH: ${CONTRIB}/snmp_mibII MOD= mibII SRCS= mibII.c mibII_ifmib.c mibII_ip.c mibII_interfaces.c \ @@ -14,6 +14,6 @@ MAN= snmp_mibII.3 DEFS= ${MOD}_tree.def INCS= snmp_${MOD}.h -CFLAGS+= -I${INCLUDEDIR}/bsnmp -I${.CURDIR} +CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I${.CURDIR} .include diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile index 6ccdf5f40f65..b101b3806019 100644 --- a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile +++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile @@ -2,6 +2,8 @@ # # Author: Harti Brandt +CONTRIB=${.CURDIR}/../../../../contrib/bsnmp + MOD= netgraph SRCS= snmp_netgraph.c MAN= snmp_netgraph.3 @@ -10,6 +12,6 @@ MIBS= BEGEMOT-NETGRAPH.txt DEFS= ${MOD}_tree.def INCS= snmp_${MOD}.h -CFLAGS+= -I${INCLUDEDIR}/bsnmp -I${.CURDIR} +CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I${.CURDIR} .include