From: John Marino <netbsd@marino.st>
Date: Thu, 4 Oct 2012 16:17:47 +0000 (+0200)
Subject: bsd.prog.mk: Avoid redefining $PROG target
X-Git-Tag: v3.2.0~29
X-Git-Url: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/b4061d6cf8a3f9e959e064a3b5127b0172117fe6

bsd.prog.mk: Avoid redefining $PROG target

In rare cases, the PROG target is intentionally redefined before
including bsd.prog.mk, but when that happens a target redefinition
warning is emitting.  This adds a check for a pre-existing $PROG
target before attempting to define it.

It stops warnings from being emitted when loader and loader_tftp
are built.
---

diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index ecaca31..f6567bd 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -32,12 +32,14 @@ LDADD+=	${OBJCLIBS}
 
 OBJS+=  ${SRCS:N*.h:N*.patch:R:S/$/.o/g}
 
+.if !target(${PROG})
 ${PROG}: ${OBJS}
 .if defined(PROG_CXX)
 	${CXX_LINK} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
 .else
 	${CC_LINK} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
 .endif
+.endif
 
 .else # !defined(SRCS)