diff options
| author | jmallett <jmallett@FreeBSD.org> | 2003-05-18 19:34:03 +0000 |
|---|---|---|
| committer | jmallett <jmallett@FreeBSD.org> | 2003-05-18 19:34:03 +0000 |
| commit | 5c072d87653305b7be5997aa33e681dfcbe68f9a (patch) | |
| tree | 4b7f1f245da03b7bec3a77dea093c4cd243e8e20 /release | |
| parent | d63b136bce32844ab4ea803a9d1ef19386067fec (diff) | |
| download | FreeBSD-src-5c072d87653305b7be5997aa33e681dfcbe68f9a.zip FreeBSD-src-5c072d87653305b7be5997aa33e681dfcbe68f9a.tar.gz | |
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)
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile index ea40d16..8f44451 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 |
