Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v
rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- src/share/mk/bsd.prog.mk	1993/03/21 09:45:37	1.1
+++ src/share/mk/bsd.prog.mk	1993/03/22 08:09:40	1.2
@@ -153,13 +153,25 @@ lint: ${SRCS} _PROGSUBDIR
 obj: _PROGSUBDIR
 .else
 obj: _PROGSUBDIR
-	@cd ${.CURDIR}; rm -rf obj; \
-	here=`pwd`; dest=/usr/obj/`echo $$here | sed 's,/usr/src/,,'`; \
-	echo "$$here -> $$dest"; ln -s $$dest obj; \
-	if test -d /usr/obj -a ! -d $$dest; then \
-		mkdir -p $$dest; \
+	@cd ${.CURDIR}; \
+	here=`pwd`; subdir=`echo $$here | sed 's,^/usr/src/,,'`; \
+	if test $$here != $$subdir ; then \
+		rm -rf obj; \
+		dest=/usr/obj/$$subdir ; \
+		echo "$$here -> $$dest"; ln -s $$dest obj; \
+		if test -d /usr/obj -a ! -d $$dest; then \
+			mkdir -p $$dest; \
+		else \
+			true; \
+		fi; \
 	else \
-		true; \
+		true ; \
+		dest=$$here/obj ; \
+		/bin/rm -f $$dest 2> /dev/null || true; \
+		echo "making $$here/obj" ; \
+		if test ! -d obj ; then \
+			mkdir $$here/obj; \
+		fi ; \
 	fi;
 .endif
 .endif