From owner-cvs-usrbin  Sun Sep  1 16:27:17 1996
Return-Path: owner-cvs-usrbin
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id QAA27431
          for cvs-usrbin-outgoing; Sun, 1 Sep 1996 16:27:17 -0700 (PDT)
Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19])
          by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id QAA27425;
          Sun, 1 Sep 1996 16:27:06 -0700 (PDT)
Received: (from bde@localhost) by godzilla.zeta.org.au (8.6.12/8.6.9) id JAA22027; Mon, 2 Sep 1996 09:25:21 +1000
Date: Mon, 2 Sep 1996 09:25:21 +1000
From: Bruce Evans <bde@zeta.org.au>
Message-Id: <199609012325.JAA22027@godzilla.zeta.org.au>
To: bde@zeta.org.au, jkh@time.cdrom.com
Subject: Re: cvs commit: src/usr.bin/make make.1
Cc: bde@freefall.freebsd.org, cvs-all@freefall.freebsd.org,
        CVS-committers@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org
Sender: owner-cvs-usrbin@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

>OK, first line testing done, and some questions:
>
>> ***************
>> *** 92,100 ****
>>   #
>>   cleanobj:
>> ! 	@if [ -d ${.TARGETOBJDIR} ]; then \
>> ! 		rm -rf ${.TARGETOBJDIR}; \
>> ! 	else \
>> ! 		cd ${.CURDIR} && ${MAKE} clean cleandepend; \
>> ! 	fi
>>   .if defined(OBJLINK)
>>   	@if [ -h ${.CURDIR}/obj ]; then rm -f ${.CURDIR}/obj; fi
>> --- 84,88 ----
>>   #
>>   cleanobj:
>> ! 	@if [ -d ${.CURDIR}/obj ]; then rm -rf ${.CURDIR}/obj; fi
>>   .if defined(OBJLINK)
>>   	@if [ -h ${.CURDIR}/obj ]; then rm -f ${.CURDIR}/obj; fi
>
>How is this supposed to work?  If I do a make cleandir with these

Not yet :-).

>patches, all it's going to do is remove the link in the link case and
>not clean anything (cleandir should clean the contents *and* remove
>the link).

I thought that there was a separate `clean' step.  (Before your changes,
`cleandir' in bsd.obj.mk did the `clean' step directly and then removed
a few more files and the obj dir.)  Anyway, I don't trust
`rm -rf ${ANYTHING}'.  The old version was much safer because it used
${SOMETHING}/${__objdir} where it was obvious that ${__objdir} was
harmless (except if ${MAKEOBJDIR} is ""; then I think the current
directory gets removed in all versions).

Bruce