Remove kludges intended to support src trees with partial obj trees.

Discussed with:	ru

5 files changed, 4 insertions, 32 deletions

diff --git a/gnu/usr.bin/cvs/Makefile.inc b/gnu/usr.bin/cvs/Makefile.inc
index e1889d6..4acfa0b 100644
--- a/gnu/usr.bin/cvs/Makefile.inc
+++ b/gnu/usr.bin/cvs/Makefile.inc
@@ -1,21 +1,13 @@
+# $FreeBSD$
+
 .if !defined(CVSDIR)
 
 CVSDIR=		$(.CURDIR)/../../../../contrib/cvs
 
-.if exists(${.OBJDIR}/../lib)
 LIBCVSDIR=	${.OBJDIR}/../lib
-.else
-LIBCVSDIR=	${.CURDIR}/../lib
-.endif
-
 LIBCVS=		${LIBCVSDIR}/libcvs.a
 
-.if exists(${.OBJDIR}/../libdiff)
 LIBDIFFDIR=	${.OBJDIR}/../libdiff
-.else
-LIBDIFFDIR=	${.CURDIR}/../libdiff
-.endif
-
 LIBDIFF=	${LIBDIFFDIR}/libdiff.a
 
 .if exists(${.CURDIR}/../../Makefile.inc)
diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc
index d197751..a7eb35a 100644
--- a/gnu/usr.bin/groff/Makefile.inc
+++ b/gnu/usr.bin/groff/Makefile.inc
@@ -66,15 +66,9 @@ indexname=Ind
 # Libraries
 
 # Bad assumption, if one exists they all exist
-.if exists(${.OBJDIR}/${TOPREL}/src/libs/libgroff)
 LIBGROFF=	${.OBJDIR}/${TOPREL}/src/libs/libgroff/libgroff.a
 LIBDRIVER=	${.OBJDIR}/${TOPREL}/src/libs/libdriver/libdriver.a
 LIBBIB=		${.OBJDIR}/${TOPREL}/src/libs/libbib/libbib.a
-.else
-LIBGROFF=	${.CURDIR}/${TOPREL}/src/libs/libgroff/libgroff.a
-LIBDRIVER=	${.CURDIR}/${TOPREL}/src/libs/libdriver/libdriver.a
-LIBBIB=		${.CURDIR}/${TOPREL}/src/libs/libbib/libbib.a
-.endif
 
 CFLAGS+=	-DHAVE_CONFIG_H
 CFLAGS+=	-I${GROFF_DIST}/src/include -I${.CURDIR}/${TOPREL}/src/include
diff --git a/gnu/usr.bin/man/Makefile.inc b/gnu/usr.bin/man/Makefile.inc
index 5793e15..e1caf90 100644
--- a/gnu/usr.bin/man/Makefile.inc
+++ b/gnu/usr.bin/man/Makefile.inc
@@ -25,12 +25,7 @@ zcat=			/usr/bin/zcat
 compress=		/usr/bin/gzip -c
 compext=		.gz
 
-.if exists(${.OBJDIR}/../lib)
 LIBDESTDIR=		${.OBJDIR}/../lib
-.else
-LIBDESTDIR=		${.CURDIR}/../lib
-.endif
-
-LIBMAN=	${LIBDESTDIR}/libman.a
+LIBMAN=			${LIBDESTDIR}/libman.a
 
 .include "../Makefile.inc"
diff --git a/gnu/usr.bin/rcs/Makefile.inc b/gnu/usr.bin/rcs/Makefile.inc
index 22d60d7..a46437a 100644
--- a/gnu/usr.bin/rcs/Makefile.inc
+++ b/gnu/usr.bin/rcs/Makefile.inc
@@ -1,7 +1,3 @@
-# Location of librcs
+# $FreeBSD$
 
-.if exists(${.OBJDIR}/../lib)
 LIBRCS=	${.OBJDIR}/../lib/librcs.a
-.else
-LIBRCS=	${.CURDIR}/../lib/librcs.a
-.endif
diff --git a/gnu/usr.bin/texinfo/Makefile.inc b/gnu/usr.bin/texinfo/Makefile.inc
index f13fa38..d5c8e81 100644
--- a/gnu/usr.bin/texinfo/Makefile.inc
+++ b/gnu/usr.bin/texinfo/Makefile.inc
@@ -1,12 +1,7 @@
 # $FreeBSD$
 
 TXIDIR=		${.CURDIR}/../../../../contrib/texinfo
-
-.if exists(${.OBJDIR}/../libtxi)
 LIBTXI=		${.OBJDIR}/../libtxi/libtxi.a
-.else
-LIBTXI=		${.CURDIR}/../libtxi/libtxi.a
-.endif
 
 CFLAGS+=	-DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\" \
 		-I${TXIDIR} -I${TXIDIR}/lib