d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release: disable the 'reldoc' target after the ASCIIDoctor switch

Browse Source 
The 'reldoc' target includes release-related documentation on
installation medium.  Since the switch from XML to ASCIIDoctor,
the file locations have moved, and it will take some time to sort
out how this target should work now.

MFC after:	3 days
Sponsored by:	Rubicon Communications, LLC ("Netgate")
This commit is contained in:
Glen Barber 2021-02-05 11:46:49 -05:00
parent 90da2c797b
commit 7b1d1a1658
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
release/Makefile
View File

@ -88,9 +88,9 @@ EXTRA_PACKAGES+= ports.txz
.if !defined(NOSRC) .if !defined(NOSRC)
EXTRA_PACKAGES+= src.txz EXTRA_PACKAGES+= src.txz
.endif .endif
.if !defined(NODOC) #.if !defined(NODOC)
EXTRA_PACKAGES+= reldoc #EXTRA_PACKAGES+= reldoc
.endif #.endif
RELEASE_TARGETS= ftp RELEASE_TARGETS= ftp
IMAGES= IMAGES=
@ -119,9 +119,9 @@ CLEANFILES+= ${I}.xz
CLEANFILES+= pkg-stage CLEANFILES+= pkg-stage
.endif .endif
CLEANDIRS= dist ftp disc1 bootonly dvd CLEANDIRS= dist ftp disc1 bootonly dvd
.if !defined(NODOC) #.if !defined(NODOC)
CLEANDIRS+= reldoc rdoc #CLEANDIRS+= reldoc rdoc
.endif #.endif
beforeclean: beforeclean:
chflags -R noschg . chflags -R noschg .
.include <bsd.obj.mk> .include <bsd.obj.mk>
@ -161,22 +161,22 @@ ports.txz:
--exclude 'usr/ports/INDEX*' --exclude work usr/ports | \ --exclude 'usr/ports/INDEX*' --exclude work usr/ports | \
${XZ_CMD} > ${.OBJDIR}/ports.txz ${XZ_CMD} > ${.OBJDIR}/ports.txz
reldoc: #reldoc:
cd ${DOCDIR}/en_US.ISO8859-1/htdocs/releases/${REVISION}R && \ # cd ${DOCDIR}/en_US.ISO8859-1/htdocs/releases/${REVISION}R && \
env MAN4DIR=${WORLDDIR}/share/man/man4 \ # env MAN4DIR=${WORLDDIR}/share/man/man4 \
_BRANCH=${BRANCH} \ # _BRANCH=${BRANCH} \
${MAKE} all install clean "FORMATS=html txt" \ # ${MAKE} all install clean "FORMATS=html txt" \
INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc \ # INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc \
WEBDIR=${DOCDIR} DESTDIR=${.OBJDIR}/rdoc # WEBDIR=${DOCDIR} DESTDIR=${.OBJDIR}/rdoc
mkdir -p reldoc # mkdir -p reldoc
.for i in hardware readme relnotes errata #.for i in hardware readme relnotes errata
ln -f ${.OBJDIR}/rdoc/${i:tl}.txt \ # ln -f ${.OBJDIR}/rdoc/${i:tl}.txt \
reldoc/${i:tu}.TXT # reldoc/${i:tu}.TXT
ln -f ${.OBJDIR}/rdoc/${i:tl}.html \ # ln -f ${.OBJDIR}/rdoc/${i:tl}.html \
reldoc/${i:tu}.HTML # reldoc/${i:tu}.HTML
.endfor #.endfor
cp ${.OBJDIR}/rdoc/docbook.css \ # cp ${.OBJDIR}/rdoc/docbook.css \
reldoc/ # reldoc/
disc1: packagesystem disc1: packagesystem
# Install system # Install system
@ -194,9 +194,9 @@ disc1: packagesystem
do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
done done
# Copy documentation, if generated # Copy documentation, if generated
.if !defined(NODOC) #.if !defined(NODOC)
cp reldoc/* ${.TARGET} # cp reldoc/* ${.TARGET}
.endif #.endif
# Set up installation environment # Set up installation environment
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
@ -222,9 +222,9 @@ bootonly: packagesystem
mkdir -p ${.TARGET}/usr/freebsd-dist mkdir -p ${.TARGET}/usr/freebsd-dist
cp MANIFEST ${.TARGET}/usr/freebsd-dist cp MANIFEST ${.TARGET}/usr/freebsd-dist
# Copy documentation, if generated # Copy documentation, if generated
.if !defined(NODOC) #.if !defined(NODOC)
cp reldoc/* ${.TARGET} # cp reldoc/* ${.TARGET}
.endif #.endif
# Set up installation environment # Set up installation environment
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
@ -247,9 +247,9 @@ dvd: packagesystem
do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
done done
# Copy documentation, if generated # Copy documentation, if generated
.if !defined(NODOC) #.if !defined(NODOC)
cp reldoc/* ${.TARGET} # cp reldoc/* ${.TARGET}
.endif #.endif
# Set up installation environment # Set up installation environment
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf