From a4b4ec9905c8312be477aec6ceea90b8ce7df589 Mon Sep 17 00:00:00 2001 From: Juli Mallett Date: Sun, 18 May 2003 19:34:03 +0000 Subject: [PATCH] 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) --- release/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index ea40d164c250..8f44451c7da8 100644 --- a/release/Makefile +++ b/release/Makefile @@ -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