From 4943bef60bece195bd9a5364e644c2b831de07dd Mon Sep 17 00:00:00 2001
From: Keith Bostic <bostic@ucbvax.Berkeley.EDU>
Date: Fri, 8 Jun 1990 21:38:56 -0800
Subject: [PATCH] don't need obj, use bsd.prog.mk

SCCS-vsn: old/ms/Makefile 5.5
SCCS-vsn: share/me/Makefile 6.10
---
 usr/src/old/ms/Makefile   |  5 +++--
 usr/src/share/me/Makefile | 13 ++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/usr/src/old/ms/Makefile b/usr/src/old/ms/Makefile
index 96141546b8..32c7eb8d48 100644
--- a/usr/src/old/ms/Makefile
+++ b/usr/src/old/ms/Makefile
@@ -1,7 +1,8 @@
-#	@(#)Makefile	5.4 (Berkeley) %G%
+#	@(#)Makefile	5.5 (Berkeley) %G%
 
 MSSRCS=	acc.ms cov.ms eqn.ms ref.ms tbl.ms ths.ms toc.ms
 TMSRCS=	tmac.s tmac.os tmac.scover
+NOOBJ=	noobj
 
 # sources for old tmac.*, previously installed in /usr/lib/tmac
 OSRCS=	tmac.sdisp tmac.skeep tmac.srefs
@@ -14,4 +15,4 @@ install:
 	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${TMSRCS} \
 	    ${DESTDIR}${BINDIR}/tmac
 
-.include <bsd.own.mk>
+.include <bsd.prog.mk>
diff --git a/usr/src/share/me/Makefile b/usr/src/share/me/Makefile
index df1f8f4c6b..1cb04f44f1 100644
--- a/usr/src/share/me/Makefile
+++ b/usr/src/share/me/Makefile
@@ -1,4 +1,4 @@
-#	@(#)Makefile	6.9 (Berkeley) %G%
+#	@(#)Makefile	6.10 (Berkeley) %G%
 
 MELIB=	${BINDIR}/me
 TMLIB=	${BINDIR}/tmac
@@ -12,19 +12,18 @@ all: ${MAN7}
 
 clean cleandir depend lint tags:
 
-install: maninstall
-	for i in ${MESRCS}; do \
+beforeinstall:
+	cd ${.CURDIR}; for i in ${MESRCS}; do \
 		sed -f strip.sed < $$i > ${DESTDIR}${MELIB}/$$i; \
 		chown ${BINOWN}.${BINGRP} ${DESTDIR}${MELIB}/$$i; \
 		chmod 444 ${DESTDIR}${MELIB}/$$i; \
 	done
-	for i in ${TMSRCS}; do \
+	cd ${.CURDIR}; for i in ${TMSRCS}; do \
 		sed -f strip.sed < $$i > ${DESTDIR}${TMLIB}/$$i; \
 		chown ${BINOWN}.${BINGRP} ${DESTDIR}${TMLIB}/$$i; \
 		chmod 444 ${DESTDIR}${TMLIB}/$$i; \
 	done
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 revisions \
+	cd ${.CURDIR}; install -c -o ${BINOWN} -g ${BINGRP} -m 444 revisions \
 	    ${DESTDIR}${MELIB}/revisions
 
-.include <bsd.own.mk>
-.include <bsd.man.mk>
+.include <bsd.prog.mk>
-- 
2.20.1