From 409ac84cb2db10ac9c93154c2f53c4e86144b446 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Wed, 30 Apr 1997 17:04:11 +0000
Subject: [PATCH] Added trailing slash to ${CANONICALOBJDIR} in tests for
 directories, so that /usr/obj can be a symlink to an existing directory.

---
 share/mk/bsd.obj.mk | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index 1f8f46551a7..5c7f44ab997 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: bsd.obj.mk,v 1.19 1997/02/22 13:56:12 peter Exp $
 #
 # The include file <bsd.obj.mk> handles creating the 'obj' directory
 # and cleaning up object files, log files etc.
@@ -66,9 +66,9 @@ obj:
 .else
 .if !defined(OBJLINK)
 obj:	_SUBDIR
-	@if ! test -d ${CANONICALOBJDIR}; then \
+	@if ! test -d ${CANONICALOBJDIR}/; then \
 		mkdir -p ${CANONICALOBJDIR}; \
-		if ! test -d ${CANONICALOBJDIR}; then \
+		if ! test -d ${CANONICALOBJDIR}/; then \
 			${ECHO} "Unable to create ${CANONICALOBJDIR}."; \
 			exit 1; \
 		fi; \
@@ -76,9 +76,9 @@ obj:	_SUBDIR
 	fi
 .else
 obj:	_SUBDIR
-	@if ! test -d ${CANONICALOBJDIR}; then \
+	@if ! test -d ${CANONICALOBJDIR}/; then \
 		mkdir -p ${CANONICALOBJDIR}; \
-		if ! test -d ${CANONICALOBJDIR}; then \
+		if ! test -d ${CANONICALOBJDIR}/; then \
 			${ECHO} "Unable to create ${CANONICALOBJDIR}."; \
 			exit 1; \
 		fi; \
@@ -92,7 +92,7 @@ obj:	_SUBDIR
 
 .if !target(objlink)
 objlink: _SUBDIR
-	@if test -d ${CANONICALOBJDIR}; then \
+	@if test -d ${CANONICALOBJDIR}/; then \
 		rm -f ${.CURDIR}/obj; \
 		ln -s ${CANONICALOBJDIR} ${.CURDIR}/obj; \
 	else \
@@ -112,7 +112,7 @@ whereobj:
 # cleanup
 #
 cleanobj:
-	@if [ -d ${CANONICALOBJDIR} ]; then \
+	@if [ -d ${CANONICALOBJDIR}/ ]; then \
 		rm -rf ${CANONICALOBJDIR}; \
 	else \
 		cd ${.CURDIR} && ${MAKE} clean cleandepend; \