diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-03-11 17:47:59 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-03-11 17:47:59 +0000 |
| commit | 6a2ebb3fe36561a568310f93a75629904918ae86 (patch) | |
| tree | 0d7827d816ff104955624a41074d8386e621d86a /release | |
| parent | 20ac0c6f7fa2a7afe3fef2ea16e1bb7a572498ba (diff) | |
| download | FreeBSD-src-6a2ebb3fe36561a568310f93a75629904918ae86.zip FreeBSD-src-6a2ebb3fe36561a568310f93a75629904918ae86.tar.gz | |
Fix bugs and make improvements to documentation renaming.
Submitted by: Garrett Cooper
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile.bsdinstall | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/release/Makefile.bsdinstall b/release/Makefile.bsdinstall index b3ff7a3..47c2ce1 100644 --- a/release/Makefile.bsdinstall +++ b/release/Makefile.bsdinstall @@ -19,6 +19,7 @@ WORLDDIR?= ${.CURDIR}/.. PORTSDIR?= /usr/ports +RELNOTES_LANG?= en_US.ISO8859-1 TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} @@ -68,12 +69,12 @@ ports.txz: reldoc: cd ${.CURDIR}/doc && ${MAKE} all install clean 'FORMATS=html txt' INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc -mkdir ${.OBJDIR}/reldoc - @for i in hardware readme relnotes errata; do \ - cp ${.OBJDIR}/rdoc/${RELNOTES_LANG}/$$i/${TARGET}/article.txt \ - ${.OBJDIR}/reldoc/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ - cp ${.OBJDIR}/rdoc/${RELNOTES_LANG}/$$i/${TARGET}/article.html \ - ${.OBJDIR}/reldoc/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \ - done +.for i in hardware readme relnotes errata + ln -f ${.OBJDIR}/rdoc/${RELNOTES_LANG}/$i/article.txt \ + ${.OBJDIR}/reldoc/${i:U}.TXT + ln -f ${.OBJDIR}/rdoc/${RELNOTES_LANG}/$i/article.html \ + ${.OBJDIR}/reldoc/${i:U}.HTM +.endfor @cp ${.OBJDIR}/rdoc/${RELNOTES_LANG}/readme/docbook.css ${.OBJDIR}/reldoc system: packagesystem @@ -85,7 +86,9 @@ system: packagesystem mkdir ${.OBJDIR}/release/usr/freebsd-dist cp ${.OBJDIR}/*.txz ${.OBJDIR}/release/usr/freebsd-dist # Copy documentation, if generated - -cp ${.OBJDIR}/reldoc/* ${.OBJDIR}/release +.if !defined(NODOC) + cp ${.OBJDIR}/reldoc/* ${.OBJDIR}/release +.endif # Set up installation environment ln -s /tmp/bsdinstall_etc/resolv.conf ${.OBJDIR}/release/etc/resolv.conf echo sendmail_enable=\"NONE\" > ${.OBJDIR}/release/etc/rc.conf |
