From 8eb37231d4405088a481324c2ec41ac851e8d8f7 Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Mon, 24 Jun 1996 04:26:21 +0000
Subject: Bring in my changes for removing the pestilent obj links (unless you
 really want them) from /usr/src.  This is the final version of the patches,
 incorporating the feedback I've received from -current.

---
 eBones/Makefile.inc         | 26 +++++++++++++-------------
 eBones/lib/libkadm/Makefile |  3 +--
 eBones/lib/libkrb/Makefile  |  3 +--
 3 files changed, 15 insertions(+), 17 deletions(-)

(limited to 'eBones')

diff --git a/eBones/Makefile.inc b/eBones/Makefile.inc
index 8ea2711..8d37845 100644
--- a/eBones/Makefile.inc
+++ b/eBones/Makefile.inc
@@ -1,40 +1,40 @@
 #	From: @(#)Makefile.inc	5.1 (Berkeley) 6/25/90
-#	$Id$
+#	$Id: Makefile.inc,v 1.10 1996/02/11 08:51:47 markm Exp $
 
 DISTRIBUTION=	krb
 
-.if exists(${.CURDIR}/../../../secure/lib/libdes/obj)
-DESOBJDIR=	${.CURDIR}/../../../secure/lib/libdes/obj
+.if exists(${.OBJDIR}/../../../secure/lib/libdes)
+DESOBJDIR=	${.OBJDIR}/../../../secure/lib/libdes
 .else
 DESOBJDIR=	${.CURDIR}/../../../secure/lib/libdes
 .endif
 
-.if exists(${.CURDIR}/../../lib/libkrb/obj)
-KRBOBJDIR=	${.CURDIR}/../../lib/libkrb/obj
+.if exists(${.OBJDIR}/../../lib/libkrb)
+KRBOBJDIR=	${.OBJDIR}/../../lib/libkrb
 .else
 KRBOBJDIR=	${.CURDIR}/../../lib/libkrb
 .endif
 
-.if exists(${.CURDIR}/../../lib/libkdb/obj)
-KDBOBJDIR=	${.CURDIR}/../../lib/libkdb/obj
+.if exists(${.OBJDIR}/../../lib/libkdb)
+KDBOBJDIR=	${.CURDIR}/../../lib/libkdb
 .else
 KDBOBJDIR=	${.CURDIR}/../../lib/libkdb
 .endif
 
-.if exists(${.CURDIR}/../../lib/libacl/obj)
-ACLOBJDIR=	${.CURDIR}/../../lib/libacl/obj
+.if exists(${.OBJDIR}/../../lib/libacl)
+ACLOBJDIR=	${.OBJDIR}/../../lib/libacl
 .else
 ACLOBJDIR=	${.CURDIR}/../../lib/libacl
 .endif
 
-.if exists(${.CURDIR}/../../lib/libkadm/obj)
-KADMOBJDIR=	${.CURDIR}/../../lib/libkadm/obj
+.if exists(${.OBJDIR}/../../lib/libkadm)
+KADMOBJDIR=	${.OBJDIR}/../../lib/libkadm
 .else
 KADMOBJDIR=	${.CURDIR}/../../lib/libkadm
 .endif
 
-.if exists(${.CURDIR}/../../lib/librkinit/obj)
-RKINITOBJDIR= ${.CURDIR}/../../lib/librkinit/obj
+.if exists(${.OBJDIR}/../../lib/librkinit)
+RKINITOBJDIR= ${.OBJDIR}/../../lib/librkinit
 .else
 RKINITOBJDIR= ${.CURDIR}/../../lib/librkinit
 .endif
diff --git a/eBones/lib/libkadm/Makefile b/eBones/lib/libkadm/Makefile
index 955cc2a..e536feb 100644
--- a/eBones/lib/libkadm/Makefile
+++ b/eBones/lib/libkadm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.8 1995/09/15 06:20:23 gibbs Exp $
+#	$Id: Makefile,v 1.9 1995/11/12 08:13:10 markm Exp $
 
 LIB=	kadm
 
@@ -19,5 +19,4 @@ beforeinstall: kadm_err.c
 .include <bsd.lib.mk>
 
 kadm_err.c: ${KADMOBJDIR}/kadm_err.h
-
 kadm_cli_wrap.o: ${KRBOBJDIR}/krb_err.h
diff --git a/eBones/lib/libkrb/Makefile b/eBones/lib/libkrb/Makefile
index 02aecaf..a78f0dd 100644
--- a/eBones/lib/libkrb/Makefile
+++ b/eBones/lib/libkrb/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.11 1995/10/06 17:37:54 gibbs Exp $
+#	$Id: Makefile,v 1.12 1995/11/12 08:13:21 markm Exp $
 
 LIB=	krb
 SHLIB_MINOR=   1
@@ -52,4 +52,3 @@ MLINKS+=tf_util.3 tf_init.3 tf_util.3 tf_get_pname.3 \
 .include <bsd.lib.mk>
 
 krb_err.c: ${KRBOBJDIR}/krb_err.h
-
-- 
cgit v1.1