Re: various 'make build' errors

[David Krause <openbsd@davidkrause.com>]

* David Krause <openbsd@davidkrause.com> [020704 14:22]:
> * Srebrenko Sehic <haver@insecure.dk> [020704 13:24]:
> > cc   -o dhcpd dhcpd.o dhcp.o bootp.o confpars.o db.o
> > -L/usr/src/usr.sbin/dhcp/common/obj -ldhcp
> > ld: -ldhcp: no match
> > collect2: ld returned 1 exit status
> > *** Error code 1
> 
> Did you do a make obj beforehand?

A build optimization was made in rev 1.7 of usr.sbin/dhcp/Makefile.inc
that breaks non-objdir builds.  This patch should fix it.

Index: usr.sbin/dhcp/Makefile.inc
===================================================================
RCS file: /home/cvs/src/usr.sbin/dhcp/Makefile.inc,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.inc
--- usr.sbin/dhcp/Makefile.inc	9 Jun 2002 06:25:31 -0000	1.7
+++ usr.sbin/dhcp/Makefile.inc	4 Jul 2002 19:45:53 -0000
@@ -41,7 +41,11 @@ CPPFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/
 	-DCLIENT_PATH=${CLIENT_PATH} -Wall -Werror
 
 COMMONDIR0!=	cd ${.CURDIR}/../common; pwd
+.if exists(${COMMONDIR0}/${__objdir})
 COMMONDIR=	${COMMONDIR0}/${__objdir}
+.else
+COMMONDIR=	${COMMONDIR0}
+.endif
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"