os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix malformed build process of www/ again.

Browse source 
The workaround in the previous commit is wrong.  Sorry.
This commit is contained in:
Hiroki Sato 2001-10-30 16:51:34 +00:00
parent b209b178f5
commit 634274d542
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/www/; revision=11079
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
share/mk/web.site.mk
View file

@ -1,5 +1,5 @@
# bsd.web.mk # bsd.web.mk
# $FreeBSD: www/share/mk/web.site.mk,v 1.37 2001/10/29 10:14:33 murray Exp $ # $FreeBSD: www/share/mk/web.site.mk,v 1.38 2001/10/30 15:09:13 hrs Exp $
# #
# Build and install a web site. # Build and install a web site.
@ -241,21 +241,21 @@ _PROGSUBDIR: .USE
.if defined(DOCSUBDIR) && !empty(DOCSUBDIR) .if defined(DOCSUBDIR) && !empty(DOCSUBDIR)
.for entry in ${DOCSUBDIR} .for entry in ${DOCSUBDIR}
@${ECHODIR} "===> ${DIRPRFX}${entry}" @${ECHODIR} "===> ${DIRPRFX}${entry}"
.if ("${WEBDIR}"="data" && "${entry}"="handbook") || "${entry}"="docproj-primer" @if [ \( "${WEBDIR}" = "data" -a "${entry}" = "handbook" \) -o "${entry}" = "docproj-primer" ]; then \
@cd ${.CURDIR}/${entry}; \ cd ${.CURDIR}/${entry}; \
${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} \ ${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} \
DIRPRFX=${DIRPRFX}${entry}/ ${PARAMS} \ DIRPRFX=${DIRPRFX}${entry}/ ${PARAMS} \
FORMATS="txt html html-split" FORMATS="txt html html-split"; \
.elif "${WEBDIR}"="data/ja" && "${entry}"="handbook" elif [ "${WEBDIR}" = "data/ja" -a "${entry}" = "handbook" ]; then \
@cd ${.CURDIR}/${entry}; \ cd ${.CURDIR}/${entry}; \
${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} \ ${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} \
DIRPRFX=${DIRPRFX}${entry}/ ${PARAMS} \ DIRPRFX=${DIRPRFX}${entry}/ ${PARAMS} \
FORMATS="html html-split" FORMATS="html html-split"; \
.else else \
@cd ${.CURDIR}/${entry}; \ cd ${.CURDIR}/${entry}; \
${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} \ ${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} \
DIRPRFX=${DIRPRFX}${entry}/ ${PARAMS} DIRPRFX=${DIRPRFX}${entry}/ ${PARAMS}; \
.endif fi
.endfor .endfor
.endif .endif