Date: Thu, 25 Oct 2001 00:10:02 -0700 (PDT) From: Cyrille Lefevre <clefevre@citeweb.net> To: freebsd-doc@freebsd.org Subject: Re: docs/31131: build/install doc isn't /usr/obj prefix clean Message-ID: <200110250710.f9P7A2n30254@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR docs/31131; it has been noted by GNATS.
From: Cyrille Lefevre <clefevre@citeweb.net>
To: freebsd-gnats-submit@FreeBSD.org, murray.stokely@windriver.com
Cc:
Subject: Re: docs/31131: build/install doc isn't /usr/obj prefix clean
Date: Thu, 25 Oct 2001 09:06:49 +0200 (CEST)
last minute fix, apply it w/ patch -p1 starting at /usr.
diff -ru old/doc/share/mk/doc.docbook.mk new/doc/share/mk/doc.docbook.mk
--- old/doc/share/mk/doc.docbook.mk Thu Oct 25 09:00:15 2001
+++ new/doc/share/mk/doc.docbook.mk Thu Oct 25 09:02:30 2001
@@ -235,6 +235,12 @@
# and INSTALL_COMPRESSED variables are wrong.
#
+.if ${.OBJDIR} != ${.CURDIR}
+LOCAL_CSS_SHEET= ${.OBJDIR}/${CSS_SHEET:T}
+.else
+LOCAL_CSS_SHEET= ${CSS_SHEET:T}
+.endif
+
.for _curformat in ${FORMATS}
_cf=${_curformat}
@@ -243,7 +249,6 @@
CLEANFILES+= $$([ -f HTML.manifest ] && ${XARGS} < HTML.manifest) \
HTML.manifest ln*.html
CLEANFILES+= PLIST.${_curformat}
-CLEANFILES+= ${LOCAL_CSS_SHEET}
.else
_docs+= ${DOC}.${_curformat}
@@ -253,18 +258,12 @@
.if ${_cf} == "html-split.tar"
CLEANFILES+= $$([ -f HTML.manifest ] && ${XARGS} < HTML.manifest) \
HTML.manifest ln*.html
-CLEANFILES+= ${LOCAL_CSS_SHEET}
-
-.elif ${_cf} == "html"
-CLEANFILES+= ${LOCAL_CSS_SHEET}
.elif ${_cf} == "html.tar"
CLEANFILES+= ${DOC}.html
-CLEANFILES+= ${LOCAL_CSS_SHEET}
.elif ${_cf} == "txt"
-CLEANFILES+= ${DOC}.html ${DOC}.html-text
-CLEANFILES+= ${LOCAL_CSS_SHEET}
+CLEANFILES+= ${DOC}.html-text
.elif ${_cf} == "dvi"
CLEANFILES+= ${DOC}.aux ${DOC}.log ${DOC}.tex
@@ -284,6 +283,13 @@
.endif
.endif
+
+.if (${LOCAL_CSS_SHEET} != ${CSS_SHEET}) && \
+ (${_cf} == "html-split" || ${_cf} == "html-split.tar" || \
+ ${_cf} == "html" || ${_cf} == "html.tar" || ${_cf} == "txt")
+CLEANFILES+= ${LOCAL_CSS_SHEET}
+.endif
+
.endfor
@@ -329,12 +335,6 @@
CLEANFILES+= ${HTML_SPLIT_INDEX} ${HTML_INDEX} ${PRINT_INDEX}
.endif
-.if ${.OBJDIR} != ${.CURDIR}
-LOCAL_CSS_SHEET= ${.OBJDIR}/${CSS_SHEET:T}
-.else
-LOCAL_CSS_SHEET= ${CSS_SHEET:T}
-.endif
-
.MAIN: all
all: ${_docs}
@@ -723,5 +723,7 @@
package-${_curformat}: ${PACKAGES}/${.CURDIR:T}.${LANGCODE}.${_curformat}.tgz
.endfor
+.if ${LOCAL_CSS_SHEET} != ${CSS_SHEET}
${LOCAL_CSS_SHEET}: ${CSS_SHEET}
${CP} -p ${.ALLSRC} ${.TARGET}
+.endif
diff -ru old/doc/share/mk/doc.html.mk new/doc/share/mk/doc.html.mk
--- old/doc/share/mk/doc.html.mk Thu Oct 25 09:00:16 2001
+++ new/doc/share/mk/doc.html.mk Thu Oct 25 09:02:32 2001
@@ -85,6 +85,12 @@
# ------------------------------------------------------------------------
#
+.if ${.OBJDIR} != ${.CURDIR}
+LOCAL_CSS_SHEET= ${.OBJDIR}/${CSS_SHEET:T}
+.else
+LOCAL_CSS_SHEET= ${CSS_SHEET:T}
+.endif
+
.for _curformat in ${FORMATS}
_cf=${_curformat}
@@ -96,7 +102,9 @@
CLEANFILES+= PLIST.${_curformat}
.if ${_cf} == "txt"
+.if ${LOCAL_CSS_SHEET} != ${CSS_SHEET}
CLEANFILES+= ${LOCAL_CSS_SHEET}
+.endif
.elif ${_cf} == "txt"
CLEANFILES+= ${DOC}.html
@@ -135,12 +143,6 @@
.endfor
.endif
-.if ${.OBJDIR} != ${.CURDIR}
-LOCAL_CSS_SHEET= ${.OBJDIR}/${CSS_SHEET:T}
-.else
-LOCAL_CSS_SHEET= ${CSS_SHEET:T}
-.endif
-
.MAIN: all
all: ${_docs}
@@ -379,5 +381,7 @@
.endif
.endfor
+.if ${LOCAL_CSS_SHEET} != ${CSS_SHEET}
${LOCAL_CSS_SHEET}: ${CSS_SHEET}
${CP} -p ${.ALLSRC} ${.TARGET}
+.endif
Cyrille.
--
Cyrille Lefevre mailto:clefevre@citeweb.net
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200110250710.f9P7A2n30254>