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.

2 files changed, 5 insertions, 11 deletions

diff --git a/secure/lib/libcrypt/test/Makefile b/secure/lib/libcrypt/test/Makefile
index b65b09f..c55a276 100644
--- a/secure/lib/libcrypt/test/Makefile
+++ b/secure/lib/libcrypt/test/Makefile
@@ -2,15 +2,9 @@
 #	Hacked Makefile to compile and run the DES-certification program,
 #	but not install anything.
 #
-# $Id: Makefile,v 1.3 1994/08/12 21:55:04 csgr Exp $
+# $Id: Makefile,v 1.4 1995/05/30 06:11:48 rgrimes Exp $
 #
-.if exists (../obj)
-OBJDIR = obj
-.else
-OBJDIR =
-.endif
-
-LIBCRYPT= $(.CURDIR)/../$(OBJDIR)/libdescrypt.a
+LIBCRYPT= $(.OBJDIR)/libdescrypt.a
 
 #CFLAGS+= -DHAVE_CRYPT16
 
diff --git a/secure/usr.bin/bdes/Makefile b/secure/usr.bin/bdes/Makefile
index 8f5234a..5af8438 100644
--- a/secure/usr.bin/bdes/Makefile
+++ b/secure/usr.bin/bdes/Makefile
@@ -1,11 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.5 1994/11/14 20:45:35 phk Exp $
+#	$Id: Makefile,v 1.6 1995/12/21 17:57:16 ache Exp $
 
 PROG=	bdes
 SRCS=	bdes.c
 
-.if exists(${.CURDIR}/../../lib/libcipher/obj)
-LDFLAGS+= -L${.CURDIR}/../../lib/libcipher/obj
+.if exists(${.OBJDIR}/../../lib/libcipher)
+LDFLAGS+= -L${.OBJDIR}/../../lib/libcipher
 .else
 LDFLAGS+= -L${.CURDIR}/../../lib/libcipher
 .endif