diff options
author | jkh <jkh@FreeBSD.org> | 1995-01-14 19:49:54 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1995-01-14 19:49:54 +0000 |
commit | 1b5946f2672391c10e7d2868d30e527f5a938f25 (patch) | |
tree | b30886f84d104978ced98b83c6534f19aa82cf95 /share/mk/bsd.doc.mk | |
parent | ece97fd6fbc200a1cc1e79af48487f87a5ee0a24 (diff) | |
download | FreeBSD-src-1b5946f2672391c10e7d2868d30e527f5a938f25.zip FreeBSD-src-1b5946f2672391c10e7d2868d30e527f5a938f25.tar.gz |
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.
Submitted by: Remy Card <Remy.Card@masi.ibp.fr>
Diffstat (limited to 'share/mk/bsd.doc.mk')
-rw-r--r-- | share/mk/bsd.doc.mk | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk index 91fed85..1b21429 100644 --- a/share/mk/bsd.doc.mk +++ b/share/mk/bsd.doc.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.doc.mk 5.3 (Berkeley) 1/2/91 -# $Id: bsd.doc.mk,v 1.12 1995/01/11 19:58:03 wollman Exp $ +# $Id: bsd.doc.mk,v 1.13 1995/01/14 07:51:04 jkh Exp $ PRINTER?= ps @@ -54,23 +54,13 @@ print: ${DOC}.${PRINTER} 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; \ + @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 ; \ - dest=$$here/obj ; \ - ${ECHO} "making $$here/obj" ; \ - if test ! -d obj ; then \ - mkdir $$here/obj; \ - fi ; \ + true; \ fi; .endif .endif |