Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Dec 2017 20:00:19 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r326667 - head/release
Message-ID:  <201712072000.vB7K0JPG092578@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gjb
Date: Thu Dec  7 20:00:19 2017
New Revision: 326667
URL: https://svnweb.freebsd.org/changeset/base/326667

Log:
  Fix the reldoc target in release/Makefile following doc commit r51264.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Thu Dec  7 19:57:51 2017	(r326666)
+++ head/release/Makefile	Thu Dec  7 20:00:19 2017	(r326667)
@@ -163,17 +163,19 @@ ports.txz:
 
 reldoc:
 	cd ${DOCDIR}/en_US.ISO8859-1/htdocs/releases/${REVISION}R && \
-	    ${MAKE} all install clean 'FORMATS=html txt' \
-	    INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc
+	    env MAN4DIR=${WORLDDIR}/share/man/man4 \
+	    ${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 ${DOCDIR}/${RELNOTES_LANG}/htdocs/releases/${REVISION}R/${i}/${i:tl}.txt \
-	    reldoc/${i:tu}.TXT
-	ln -f ${DOCDIR}/${RELNOTES_LANG}/htdocs/releases/${REVISION}R/${i}/${i:tl}.html \
-	    reldoc/${i:tu}.HTM
+	ln -f ${.OBJDIR}/rdoc/${i:tl}.txt \
+		reldoc/${i:tu}.TXT
+	ln -f ${.OBJDIR}/rdoc/${i:tl}.html \
+		reldoc/${i:tu}.HTML
 .endfor
-	cp ${DOCDIR}/${RELNOTES_LANG}/htdocs/releases/${REVISION}R/readme/docbook.css \
-	    reldoc
+	cp ${.OBJDIR}/rdoc/docbook.css \
+		reldoc/
 
 disc1: packagesystem
 # Install system



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712072000.vB7K0JPG092578>