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.10
retrieving revision 1.19
diff -u -p -r1.10 -r1.19
--- src/share/mk/bsd.prog.mk	1993/04/25 04:15:26	1.10
+++ src/share/mk/bsd.prog.mk	1993/07/17 12:18:12	1.19
@@ -4,7 +4,7 @@
 .include "${.CURDIR}/../Makefile.inc"
 .endif
 
-.SUFFIXES: .out .o .c .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0
+.SUFFIXES: .out .o .c .cc .C .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0
 
 .8.0 .7.0 .6.0 .5.0 .4.0 .3.0 .2.0 .1.0:
 	nroff -mandoc ${.IMPSRC} > ${.TARGET}
@@ -20,6 +20,9 @@ BINMODE?=	555
 LIBCRT0?=	/usr/lib/crt0.o
 LIBC?=		/usr/lib/libc.a
 LIBCOMPAT?=	/usr/lib/libcompat.a
+.ifndef EXPORTABLE_SYSTEM
+LIBCRYPT?=	/usr/lib/libcrypt.a
+.endif
 LIBCURSES?=	/usr/lib/libcurses.a
 LIBDBM?=	/usr/lib/libdbm.a
 LIBDES?=	/usr/lib/libdes.a
@@ -32,6 +35,7 @@ LIBPC?=		/usr/lib/libpc.a
 LIBPLOT?=	/usr/lib/libplot.a
 LIBRESOLV?=	/usr/lib/libresolv.a
 LIBRPC?=	/usr/lib/librpc.a
+LIBRPCSVC?=	/usr/lib/librpcsvc.a
 LIBTERM?=	/usr/lib/libterm.a
 LIBUTIL?=	/usr/lib/libutil.a
 
@@ -41,6 +45,16 @@ CLEANFILES+=strings
 	${CC} -E ${CFLAGS} ${.IMPSRC} | xstr -c -
 	@${CC} ${CFLAGS} -c x.c -o ${.TARGET}
 	@rm -f x.c
+
+.cc.o:
+	${CXX} -E ${CXXFLAGS} ${.IMPSRC} | xstr -c -
+	@mv -f x.c x.cc
+	@${CXX} ${CXXFLAGS} -c x.cc -o ${.TARGET}
+
+.C.o:
+	${CXX} -E ${CXXFLAGS} ${.IMPSRC} | xstr -c -
+	@mv -f x.c x.C
+	@${CXX} ${CXXFLAGS} -c x.C -o ${.TARGET}
 .endif
 
 .if defined(PROG)
@@ -65,19 +79,20 @@ ${PROG}: ${OBJS} ${LIBC} ${DPADD}
 SRCS= ${PROG}.c
 
 ${PROG}: ${SRCS} ${LIBC} ${DPADD}
-	${CC} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${SRCS} ${LDADD}
+	${CC} ${LDFLAGS} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${SRCS} ${LDADD}
 
 MKDEP=	-p
 
 .endif
 
-.if !defined(NOMAN)
 .if	!defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \
 	!defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \
 	!defined(MAN7) && !defined(MAN8)
 MAN1=	${PROG}.0
 .endif
 .endif
+
+.if !defined(NOMAN)
 MANALL=	${MAN1} ${MAN2} ${MAN3} ${MAN4} ${MAN5} ${MAN6} ${MAN7} ${MAN8}
 .endif
 
@@ -113,13 +128,15 @@ cleandir: _PROGSUBDIR
 depend: .depend _PROGSUBDIR
 .depend: ${SRCS}
 .if defined(PROG)
-	mkdep ${MKDEP} ${CFLAGS:M-[ID]*} ${.ALLSRC:M*.c}
+	mkdep ${MKDEP} ${CFLAGS:M-[ID+]*} ${.ALLSRC:M*.c} ${.ALLSRC:M*.cc} \
+		${.ALLSRC:M*.C} ${.ALLSRC:M*.cxx}
 .endif
 .endif
 
 .if !target(install)
 .if !target(beforeinstall)
 beforeinstall:
+.if defined(DESTDIR) || defined(BINDIR)
 	@if [ ! -d "${DESTDIR}${BINDIR}" ]; then \
                 /bin/rm -f ${DESTDIR}${BINDIR} ; \
                 mkdir -p ${DESTDIR}${BINDIR} ; \
@@ -129,10 +146,12 @@ beforeinstall:
                 true ; \
         fi
 .endif
+.endif
 .if !target(afterinstall)
 afterinstall:
 .endif
 
+.if !target(realinstall)
 realinstall: _PROGSUBDIR
 .if defined(PROG)
 	install ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
@@ -154,6 +173,7 @@ realinstall: _PROGSUBDIR
 		ln $$l $$t; \
 	done; true
 .endif
+.endif
 
 install: maninstall
 maninstall: afterinstall