svn commit: r51068 - in head/en_US.ISO8859-1/htdocs/releases/12.0R: . errata hardware readme relnotes
Glen Barber <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
Author: gjb
Date: Fri Oct 6 16:53:20 2017
New Revision: 51068
URL: https://svnweb.freebsd.org/changeset/doc/51068
Log:
- Fix dev-auto.ent generation so the target file exists only on
success. [1]
- Fix the clean target for 12.0R/*/ subdirectories. [2]
- Add missing CLEANFILES for index.html and schedule.html.
Suggested by; wosch [1]
Reported by: wosch [1], [2]
Sponsored by: The FreeBSD Foundation
Modified:
head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile
head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile
head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile
head/en_US.ISO8859-1/htdocs/releases/12.0R/readme/Makefile
head/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/Makefile
Modified: head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile Fri Oct 6 14:22:45 2017 (r51067)
+++ head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile Fri Oct 6 16:53:20 2017 (r51068)
@@ -80,7 +80,9 @@ D+= relnotes
MAN4PAGES?= ${MAN4DIR}/*.4 ${MAN4DIR}/man4.*/*.4
ARCHLIST?= ${.CURDIR}/../../share/misc/dev.archlist.txt
-CLEANFILES+= dev-auto.ent
+CLEANFILES+= dev-auto.ent \
+ index.html \
+ schedule.html
MAN2HWNOTES_CMD=${.CURDIR}/../../share/misc/man2hwnotes.pl
.if defined(HWNOTES_MI)
@@ -90,14 +92,14 @@ MAN2HWNOTES_FLAGS= -c
.endif
dev-auto.ent:
- ${PERL} ${MAN2HWNOTES_CMD} ${MAN2HWNOTES_FLAGS} -a ${ARCHLIST} -o ${.TARGET} ${MAN4PAGES}
+ ${PERL} ${MAN2HWNOTES_CMD} ${MAN2HWNOTES_FLAGS} -a ${ARCHLIST} -o ${.TARGET}.tmp ${MAN4PAGES}
+ ${MV} ${.TARGET}.tmp ${.TARGET}
-beforebuild: dev-auto.ent
-
+.if make(clean)
beforeclean:
-.for _SD in ${D}
- ${MAKE} -C ${_SD} DOCINSTALLDIR=${DOCINSTALLDIR} clean
-.endfor
+SUBDIR+= ${D}
+.include "${DOC_PREFIX}/share/mk/doc.subdir.mk"
+.endif
beforeinstall:
.for _SD in ${D}
Modified: head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile Fri Oct 6 14:22:45 2017 (r51067)
+++ head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile Fri Oct 6 16:53:20 2017 (r51068)
@@ -21,7 +21,6 @@ SRCS?= errata.xml
DATA+= ${DOC}.html
-beforeclean:
CLEANFILES+= ${DOC}.html \
${DOC}.txt \
catalog-cwd.xml \
Modified: head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile Fri Oct 6 14:22:45 2017 (r51067)
+++ head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile Fri Oct 6 16:53:20 2017 (r51068)
@@ -21,7 +21,6 @@ SRCS?= hardware.xml
DATA+= ${DOC}.html
-beforeclean:
CLEANFILES+= ${DOC}.html \
${DOC}.txt \
catalog-cwd.xml \
Modified: head/en_US.ISO8859-1/htdocs/releases/12.0R/readme/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/12.0R/readme/Makefile Fri Oct 6 14:22:45 2017 (r51067)
+++ head/en_US.ISO8859-1/htdocs/releases/12.0R/readme/Makefile Fri Oct 6 16:53:20 2017 (r51068)
@@ -21,7 +21,6 @@ SRCS?= readme.xml
DATA+= ${DOC}.html
-beforeclean:
CLEANFILES+= ${DOC}.html \
${DOC}.txt \
catalog-cwd.xml \
Modified: head/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/Makefile Fri Oct 6 14:22:45 2017 (r51067)
+++ head/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/Makefile Fri Oct 6 16:53:20 2017 (r51068)
@@ -21,7 +21,6 @@ SRCS?= relnotes.xml
DATA+= ${DOC}.html
-beforeclean:
CLEANFILES+= ${DOC}.html \
${DOC}.txt \
catalog-cwd.xml \
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"