For EXT*DIR, use -H in addition to -R, so that a symlink may be

used in the EXTSRCDIR case, for example, if one finds it useful
to symlink /usr/src to an actual source tree, and use /usr/src
as the EXTSRCDIR.

This has no effects on release builds not using external directories.

Reviewed by:	ru
Approved by:	scottl (re)
This commit is contained in:
Juli Mallett 2003-05-18 19:34:03 +00:00
parent ca15350e7d
commit a4b4ec9905
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=115139

View File

@ -336,12 +336,12 @@ release rerelease:
fi
.if defined(EXTLOCALDIR)
rm -rf ${CHROOTDIR}/usr/local
cd ${CHROOTDIR}/usr && cp -R ${EXTLOCALDIR} local
cd ${CHROOTDIR}/usr && cp -R -H ${EXTLOCALDIR} local
.endif
rm -rf ${CHROOTDIR}/usr/src
.if defined(EXTSRCDIR)
cd ${CHROOTDIR}/usr && \
cp -R ${EXTSRCDIR} src
cp -R -H ${EXTSRCDIR} src
.else
cd ${CHROOTDIR}/usr && \
${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_SRCARGS} ${RELEASESRCMODULE}
@ -359,7 +359,7 @@ release rerelease:
.if !defined(NODOC)
rm -rf ${CHROOTDIR}/usr/doc
.if defined(EXTDOCDIR)
cd ${CHROOTDIR}/usr && cp -R ${EXTDOCDIR} doc
cd ${CHROOTDIR}/usr && cp -R -H ${EXTDOCDIR} doc
.else
cd ${CHROOTDIR}/usr && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_DOCARGS} ${RELEASEDOCMODULE}
.endif