Date: Sat, 14 Jan 1995 20:28:25 +0100 (MET) From: Remy.Card@masi.ibp.fr (Remy CARD) To: hackers@FreeBSD.org Subject: Patch for bsd.doc.mk Message-ID: <199501141928.UAA18890@ares.ibp.fr>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199501141928.UAA18890>