Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.124 retrieving revision 1.127 diff -u -p -r1.124 -r1.127 --- src/share/mk/bsd.prog.mk 2001/01/14 06:17:27 1.124 +++ src/share/mk/bsd.prog.mk 2001/01/14 20:49:36 1.127 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.124 2001/01/14 06:17:27 christos Exp $ +# $NetBSD: bsd.prog.mk,v 1.127 2001/01/14 20:49:36 christos Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .if !target(__initialized__) @@ -119,19 +119,21 @@ LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c= .if defined(OBJS) && !empty(OBJS) .NOPATH: ${OBJS} -.if !target(${PROG}) .if defined(DESTDIR) ${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} +.if !commands(${PROG}) ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -Wl,-rpath-link,${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${DESTDIR}/usr/lib -lgcc -lc -lgcc ${LIBCRTEND} +.endif .else ${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} +.if !commands(${PROG}) ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD} +.endif .endif # defined(DESTDIR) -.endif # !target(${PROG}) .endif # defined(OBJS) && !empty(OBJS) .if !defined(MAN)