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.lib.mk,v
rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.8
retrieving revision 1.16
diff -u -p -r1.8 -r1.16
--- src/share/mk/bsd.lib.mk	1993/04/09 20:05:58	1.8
+++ src/share/mk/bsd.lib.mk	1993/06/17 03:45:08	1.16
@@ -47,7 +47,9 @@ BINMODE?=	555
 	@${LD} -X -r ${.TARGET}
 	@mv a.out ${.TARGET}
 
+.if !defined(NOMAN)
 MANALL=	${MAN1} ${MAN2} ${MAN3} ${MAN4} ${MAN5} ${MAN6} ${MAN7} ${MAN8}
+.endif
 
 .if !defined(NOPROFILE)
 _LIBS=lib${LIB}.a lib${LIB}_p.a
@@ -63,28 +65,32 @@ lib${LIB}.a:: ${OBJS}
 	@echo building standard ${LIB} library
 	@rm -f lib${LIB}.a
 	@${AR} cTq lib${LIB}.a `lorder ${OBJS} | tsort` ${LDADD}
-	ranlib lib${LIB}.a
+	${RANLIB} lib${LIB}.a
 
 POBJS+=	${OBJS:.o=.po}
 lib${LIB}_p.a:: ${POBJS}
 	@echo building profiled ${LIB} library
 	@rm -f lib${LIB}_p.a
 	@${AR} cTq lib${LIB}_p.a `lorder ${POBJS} | tsort` ${LDADD}
-	ranlib lib${LIB}_p.a
+	${RANLIB} lib${LIB}_p.a
 
 llib-l${LIB}.ln: ${SRCS}
 	${LINT} -C${LIB} ${CFLAGS} ${.ALLSRC:M*.c}
 
 .if !target(clean)
 clean:
-	rm -f a.out Errs errs mklog core ${CLEANFILES} ${OBJS} ${POBJS} \
-	    profiled/*.o lib${LIB}.a lib${LIB}_p.a llib-l${LIB}.ln
+	rm -f a.out Errs errs mklog core ${CLEANFILES}
+	rm -f ${OBJS}
+	rm -f ${POBJS} profiled/*.o
+	rm -f lib${LIB}.a lib${LIB}_p.a llib-l${LIB}.ln
 .endif
 
 .if !target(cleandir)
 cleandir:
-	rm -f a.out Errs errs mklog core ${CLEANFILES} ${OBJS} ${POBJS} \
-	    profiled/*.o lib${LIB}.a lib${LIB}_p.a llib-l${LIB}.ln
+	rm -f a.out Errs errs mklog core ${CLEANFILES}
+	rm -f ${OBJS}
+	rm -f ${POBJS} profiled/*.o
+	rm -f lib${LIB}.a lib${LIB}_p.a llib-l${LIB}.ln
 	rm -f ${MANALL} ${.CURDIR}/tags .depend
 .endif
 
@@ -93,7 +99,7 @@ depend: .depend
 .depend: ${SRCS}
 	mkdep ${CFLAGS:M-[ID+]*} ${AINC} ${.ALLSRC}
 	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o:/\1.o \1.po:/' < .depend > $$TMP; \
+	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.po:/' < .depend > $$TMP; \
 	    mv $$TMP .depend)
 .endif
 
@@ -110,15 +116,17 @@ beforeinstall:
 	fi
 .endif
 
-realinstall: beforeinstall
-	ranlib lib${LIB}.a
+realinstall:
+#	ranlib lib${LIB}.a
 	install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} lib${LIB}.a \
 	    ${DESTDIR}${LIBDIR}
 	${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}.a
-	ranlib lib${LIB}_p.a
+.if !defined(NOPROFILE)
+#	ranlib lib${LIB}_p.a
 	install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    lib${LIB}_p.a ${DESTDIR}${LIBDIR}
 	${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
+.endif
 #	install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 #	    llib-l${LIB}.ln ${DESTDIR}${LINTLIBDIR}
 .if defined(LINKS) && !empty(LINKS)
@@ -134,8 +142,10 @@ realinstall: beforeinstall
 	done; true
 .endif
 
-install: afterinstall
-afterinstall: realinstall maninstall
+install: maninstall
+maninstall: afterinstall
+afterinstall: realinstall
+realinstall: beforeinstall
 .endif
 
 .if !target(lint)
@@ -148,7 +158,10 @@ tags: ${SRCS}
 	    sed "s;\${.CURDIR}/;;" > tags
 .endif
 
+.if !defined(NOMAN)
 .include <bsd.man.mk>
+.endif
+
 .if !target(obj)
 .if defined(NOOBJ)
 obj: