From owner-freebsd-hackers  Sat Jan 14 11:30:48 1995
Return-Path: hackers-owner
Received: (from root@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id LAA02859 for hackers-outgoing; Sat, 14 Jan 1995 11:30:48 -0800
Received: from ibp.ibp.fr (ibp.ibp.fr [132.227.60.30]) by freefall.cdrom.com (8.6.9/8.6.6) with ESMTP id LAA02852 for <hackers@freebsd.org>; Sat, 14 Jan 1995 11:30:46 -0800
Received: from masi.ibp.fr (root@masi.ibp.fr [132.227.60.23])
	by ibp.ibp.fr (8.6.8/jtpda-5.0) with ESMTP id UAA02203
	for <hackers@freebsd.org>; Sat, 14 Jan 1995 20:31:45 +0100
Received: from ares.ibp.fr (card@ares.ibp.fr [132.227.64.31])
	by masi.ibp.fr (8.6.9/jtpda-5.0) with ESMTP id UAA14034
	for <hackers@freebsd.org>; Sat, 14 Jan 1995 20:30:57 +0100
From: Remy.Card@masi.ibp.fr (Remy CARD)
Received: by ares.ibp.fr
	(8.6.9/jtpda-5.0) id UAA18890
	for hackers@freebsd.org; Sat, 14 Jan 1995 20:28:25 +0100
Message-Id: <199501141928.UAA18890@ares.ibp.fr>
Subject: Patch for bsd.doc.mk
To: hackers@FreeBSD.org
Date: Sat, 14 Jan 1995 20:28:25 +0100 (MET)
X-Mailer: ELM [version 2.4 PL21]
Content-Type: text
Content-Length: 1498      
Sender: hackers-owner@FreeBSD.org
Precedence: bulk


	Hi,

	The enclosed patch makes bsd.doc.mk consistent with bsd.prog.mk
when creating the obj link.  While bsd.prog.mk inconditionnaly creates
a link in /usr/obj, bsd.doc.mk tests if the source tree is contained in
/usr/src.  If so, it creates a link to /usr/obj.  If the source tree
is contained in another directory, bsd.doc.mk creates an obj subdirectory.

	This patches makes bsd.doc.mk behave like bsd.prog.mk (I have simply
copied the obj rule from bsd.prog.mk).

	Can someone please commit it?

	Thanks

		Remy

*** share/mk/bsd.doc.mk.orig	Sat Jan 14 19:52:16 1995
--- share/mk/bsd.doc.mk	Sat Jan 14 20:00:57 1995
***************
*** 54,76 ****
  obj:
  .else
  obj:
! 	@cd ${.CURDIR}; rm -f obj > /dev/null 2>&1 || true; \
! 	here=`pwd`; subdir=`echo $$here | sed 's,^/usr/src/,,'`; \
! 	if test $$here != $$subdir ; then \
! 		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 ; \
! 		dest=$$here/obj ; \
! 		${ECHO} "making $$here/obj" ; \
! 		if test ! -d obj ; then \
! 			mkdir $$here/obj; \
! 		fi ; \
  	fi;
  .endif
  .endif
--- 54,66 ----
  obj:
  .else
  obj:
! 	@cd ${.CURDIR}; rm -f 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; \
  	else \
! 		true; \
  	fi;
  .endif
  .endif