aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2021-02-05 16:46:49 +0000
committerGlen Barber <gjb@FreeBSD.org>2021-02-05 16:47:15 +0000
commit7b1d1a1658ffb69eff93afc713f9e88ed8b20eac (patch)
treea3d02976eebc643413ecb0918516afcc51bd3d5d /release
parent90da2c797bfa7639005ed46ab9173feb8bd85ecd (diff)
downloadsrc-7b1d1a1658ffb69eff93afc713f9e88ed8b20eac.tar.gz
src-7b1d1a1658ffb69eff93afc713f9e88ed8b20eac.zip
release: disable the 'reldoc' target after the ASCIIDoctor switch
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")
Diffstat (limited to 'release')
-rw-r--r--release/Makefile62
1 files changed, 31 insertions, 31 deletions
diff --git a/release/Makefile b/release/Makefile
index 3df1e461d64e..77df7762e412 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -88,9 +88,9 @@ EXTRA_PACKAGES+= ports.txz
.if !defined(NOSRC)
EXTRA_PACKAGES+= src.txz
.endif
-.if !defined(NODOC)
-EXTRA_PACKAGES+= reldoc
-.endif
+#.if !defined(NODOC)
+#EXTRA_PACKAGES+= reldoc
+#.endif
RELEASE_TARGETS= ftp
IMAGES=
@@ -119,9 +119,9 @@ CLEANFILES+= ${I}.xz
CLEANFILES+= pkg-stage
.endif
CLEANDIRS= dist ftp disc1 bootonly dvd
-.if !defined(NODOC)
-CLEANDIRS+= reldoc rdoc
-.endif
+#.if !defined(NODOC)
+#CLEANDIRS+= reldoc rdoc
+#.endif
beforeclean:
chflags -R noschg .
.include <bsd.obj.mk>
@@ -161,22 +161,22 @@ ports.txz:
--exclude 'usr/ports/INDEX*' --exclude work usr/ports | \
${XZ_CMD} > ${.OBJDIR}/ports.txz
-reldoc:
- cd ${DOCDIR}/en_US.ISO8859-1/htdocs/releases/${REVISION}R && \
- env MAN4DIR=${WORLDDIR}/share/man/man4 \
- _BRANCH=${BRANCH} \
- ${MAKE} all install clean "FORMATS=html txt" \
- INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc \
- WEBDIR=${DOCDIR} DESTDIR=${.OBJDIR}/rdoc
- mkdir -p reldoc
-.for i in hardware readme relnotes errata
- ln -f ${.OBJDIR}/rdoc/${i:tl}.txt \
- reldoc/${i:tu}.TXT
- ln -f ${.OBJDIR}/rdoc/${i:tl}.html \
- reldoc/${i:tu}.HTML
-.endfor
- cp ${.OBJDIR}/rdoc/docbook.css \
- reldoc/
+#reldoc:
+# cd ${DOCDIR}/en_US.ISO8859-1/htdocs/releases/${REVISION}R && \
+# env MAN4DIR=${WORLDDIR}/share/man/man4 \
+# _BRANCH=${BRANCH} \
+# ${MAKE} all install clean "FORMATS=html txt" \
+# INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc \
+# WEBDIR=${DOCDIR} DESTDIR=${.OBJDIR}/rdoc
+# mkdir -p reldoc
+#.for i in hardware readme relnotes errata
+# ln -f ${.OBJDIR}/rdoc/${i:tl}.txt \
+# reldoc/${i:tu}.TXT
+# ln -f ${.OBJDIR}/rdoc/${i:tl}.html \
+# reldoc/${i:tu}.HTML
+#.endfor
+# cp ${.OBJDIR}/rdoc/docbook.css \
+# reldoc/
disc1: packagesystem
# Install system
@@ -194,9 +194,9 @@ disc1: packagesystem
do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
done
# Copy documentation, if generated
-.if !defined(NODOC)
- cp reldoc/* ${.TARGET}
-.endif
+#.if !defined(NODOC)
+# cp reldoc/* ${.TARGET}
+#.endif
# Set up installation environment
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
@@ -222,9 +222,9 @@ bootonly: packagesystem
mkdir -p ${.TARGET}/usr/freebsd-dist
cp MANIFEST ${.TARGET}/usr/freebsd-dist
# Copy documentation, if generated
-.if !defined(NODOC)
- cp reldoc/* ${.TARGET}
-.endif
+#.if !defined(NODOC)
+# cp reldoc/* ${.TARGET}
+#.endif
# Set up installation environment
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
@@ -247,9 +247,9 @@ dvd: packagesystem
do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
done
# Copy documentation, if generated
-.if !defined(NODOC)
- cp reldoc/* ${.TARGET}
-.endif
+#.if !defined(NODOC)
+# cp reldoc/* ${.TARGET}
+#.endif
# Set up installation environment
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf