From owner-freebsd-bugs  Sat Sep  9  0: 4: 4 2000
Delivered-To: freebsd-bugs@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 52AB037B440
	for <freebsd-bugs@FreeBSD.org>; Sat,  9 Sep 2000 00:04:00 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id AAA22483;
	Sat, 9 Sep 2000 00:00:03 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from fun.ee.lbl.gov (fun.ee.lbl.gov [131.243.1.81])
	by hub.freebsd.org (Postfix) with ESMTP id AFDE637B43F
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  8 Sep 2000 23:54:54 -0700 (PDT)
Received: (from leres@localhost)
	by fun.ee.lbl.gov (8.11.0/8.11.0) id e896r7S00931;
	Fri, 8 Sep 2000 23:53:07 -0700 (PDT)
Message-Id: <200009090653.e896r7S00931@fun.ee.lbl.gov>
Date: Fri, 08 Sep 2000 23:53:07 -0700
From: Craig Leres <leres@ee.lbl.gov>
To: FreeBSD-gnats-submit@freebsd.org
Cc: leres@ee.lbl.gov (Craig Leres)
X-Send-Pr-Version: 3.2
Subject: bin/21142: [PATCH] avoid errors from "make objlink" when NOOBJ is defined
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         21142
>Category:       bin
>Synopsis:       [PATCH] avoid errors from "make objlink" when NOOBJ is defined
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 09 00:00:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Craig Leres
>Release:        FreeBSD 4.1-RELEASE i386
>Organization:
Lawrence Berkeley National Laboratory
>Environment:
>Description:

	If NOOBJ is defined, make does not try to make an obj directory.
	However it still tries to make an objlink.

>How-To-Repeat:

	fun 401 % cd /usr/src/share/dict
	fun 402 % make obj objlink
	No /usr/obj/usr/src/share/dict to link to - do a make obj.

>Fix:

	Context diffs to share/mk/bsd.obj.mk are appended. This
	Make objlink work like obj (a noop when NOOBJ is defined).

===================================================================
RCS file: RCS/bsd.obj.mk,v
retrieving revision 1.1
diff -c -r1.1 bsd.obj.mk
*** bsd.obj.mk	2000/09/09 06:42:52	1.1
--- bsd.obj.mk	2000/09/09 06:49:56
***************
*** 79,84 ****
--- 79,87 ----
  .endif
  
  .if !target(objlink)
+ .if defined(NOOBJ)
+ objlink:
+ .else
  objlink: _SUBDIR
  	@if test -d ${CANONICALOBJDIR}/; then \
  		rm -f ${.CURDIR}/obj; \
***************
*** 86,91 ****
--- 89,95 ----
  	else \
  		echo "No ${CANONICALOBJDIR} to link to - do a make obj."; \
  	fi
+ .endif
  .endif
  
  #

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message