From 4a1861f4d760f487cc9f832f4478e6c657ca106f Mon Sep 17 00:00:00 2001
From: conklin <conklin@FreeBSD.org>
Date: Fri, 9 Jul 1993 16:15:13 +0000
Subject: Update makefiles: 	centralize obj/noobj conditional in
 Makefile.inc 	use DPADD 	don't compile profiling library 
 install rcsfreeze correctly After this commit, the freebsd and netbsd rcs
 distribution will be in sync.

---
 gnu/usr.bin/rcs/rcsmerge/Makefile | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'gnu/usr.bin/rcs/rcsmerge')

diff --git a/gnu/usr.bin/rcs/rcsmerge/Makefile b/gnu/usr.bin/rcs/rcsmerge/Makefile
index c927b46..801b01e 100644
--- a/gnu/usr.bin/rcs/rcsmerge/Makefile
+++ b/gnu/usr.bin/rcs/rcsmerge/Makefile
@@ -1,12 +1,8 @@
-PROG= rcsmerge
+PROG=	rcsmerge
 SRCS=	rcsmerge.c 
-
-.if exists(${.CURDIR}/../lib/obj)
-LDADD=  -L${.CURDIR}/../lib/obj -lrcs
-.else
-LDADD=  -L${.CURDIR}/../lib/ -lrcs
-.endif
-
 CFLAGS+= -I${.CURDIR}/../lib
+LDADD=	${LIBRCS}
+DPADD=	${LIBRCS}
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
-- 
cgit v1.1