diff options
| author | ru <ru@FreeBSD.org> | 2002-04-12 11:21:09 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2002-04-12 11:21:09 +0000 |
| commit | f94502c94d17947663ff5ab4cd417f8617f7df54 (patch) | |
| tree | be483589a84745134998f36e31a8cdf21a8bc27b | |
| parent | f6dc026cb3736ee12903a374020240570c8e836e (diff) | |
| download | FreeBSD-src-f94502c94d17947663ff5ab4cd417f8617f7df54.zip FreeBSD-src-f94502c94d17947663ff5ab4cd417f8617f7df54.tar.gz | |
Fixed the fatal breakage I introduced in the last commit.
Make the defined(SRCS) case similar to the !defined(SRCS)
case - only define ${PROG}: ${OBJS} if the ${PROG} target
does not exist. This has only one precedence in the entire
source tree, usr.bin/doscmd, and its Makefile is horribly
broken. I will temporarily unconnect it from build until
I'm working on the fix.
| -rw-r--r-- | share/mk/bsd.prog.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 950736fe..90d1b90 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -25,6 +25,7 @@ PROG= ${PROG_CXX} .endif .if defined(PROG) +.if !target(${PROG}) .if defined(SRCS) # If there are Objective C sources, link with Objective C libraries. @@ -37,7 +38,6 @@ OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .else !defined(SRCS) -.if !target(${PROG}) .if defined(PROG_CXX) SRCS= ${PROG}.cc .else |
