diff options
| author | bde <bde@FreeBSD.org> | 1997-04-30 17:04:11 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-04-30 17:04:11 +0000 |
| commit | 97eaf329289ea795b79f1e97db8bc5094fe617aa (patch) | |
| tree | 3a34fe483aafd11121c337c3fa4ff4408780ccdd /share/mk/bsd.obj.mk | |
| parent | d3610b641239e3503da97ed8dffa8c2810ff9672 (diff) | |
| download | FreeBSD-src-97eaf329289ea795b79f1e97db8bc5094fe617aa.zip FreeBSD-src-97eaf329289ea795b79f1e97db8bc5094fe617aa.tar.gz | |
Added trailing slash to ${CANONICALOBJDIR} in tests for directories,
so that /usr/obj can be a symlink to an existing directory.
Diffstat (limited to 'share/mk/bsd.obj.mk')
| -rw-r--r-- | share/mk/bsd.obj.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index 1f8f465..5c7f44a 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; \ |
