diff --git a/en/FAQ/Makefile b/en/FAQ/Makefile index 426cc723ff..b51f080483 100644 --- a/en/FAQ/Makefile +++ b/en/FAQ/Makefile @@ -1,11 +1,11 @@ # -# $Id: Makefile,v 1.1 1999-08-19 20:45:50 nik Exp $ +# $Id: Makefile,v 1.2 1999-09-03 14:01:12 kuriyama Exp $ # # Build the FreeBSD FAQ *outside* of the www tree, and install it # in to the right place as necessary. all install clean: - (cd ../../../doc/en_US.ISO_8859-1/books/faq; make 'FORMATS=html-split html' DESTDIR=${DESTDIR}/data/FAQ ${.TARGET}) + (cd ../../../doc/en_US.ISO_8859-1/books/faq && make 'FORMATS=html-split html' DESTDIR=${DESTDIR}/data/FAQ ${.TARGET}) .if make(install) (cd ${DESTDIR}/data/FAQ; ln -sf index.html FAQ.html) .endif diff --git a/en/handbook/Makefile b/en/handbook/Makefile index 39c7e525cf..0ea53def85 100644 --- a/en/handbook/Makefile +++ b/en/handbook/Makefile @@ -1,18 +1,18 @@ # -# $Id: Makefile,v 1.2 1999-08-19 20:40:58 nik Exp $ +# $Id: Makefile,v 1.3 1999-09-03 14:01:14 kuriyama Exp $ # # Build the FreeBSD Handbook *outside* of the www tree, and install it # in to the right place as necessary. # # The Handbook is no longer completely self contained in # doc/en_US.ISO_8859-1/books/handbook, (it requires support files outside of # this directory) and it is much simpler to build it outside the web tree # than it is to make a nest of symlinks to try and build it inside the tree. # # This assumes that you have the www/ and doc/ trees checked out beside # one another -- this was always the case anyway, so there are no extra # requirements here. # all install clean: - (cd ../../../doc/en_US.ISO_8859-1/books/handbook; make FORMATS=html-split DESTDIR=${DESTDIR}/data/handbook ${.TARGET}) + (cd ../../../doc/en_US.ISO_8859-1/books/handbook && make FORMATS=html-split DESTDIR=${DESTDIR}/data/handbook ${.TARGET}) diff --git a/en/tutorials/Makefile b/en/tutorials/Makefile index 96b62b0588..4f22263b19 100644 --- a/en/tutorials/Makefile +++ b/en/tutorials/Makefile @@ -1,13 +1,13 @@ # -# $Id: Makefile,v 1.1 1999-08-19 20:49:29 nik Exp $ +# $Id: Makefile,v 1.2 1999-09-03 14:01:15 kuriyama Exp $ # # Build the FreeBSD tutorials/articles outside of the www tree, and then # install them in to the right place. DOCS = index.sgml all afterinstall clean: index.html - (cd ../../../doc/en_US.ISO_8859-1/articles; make 'FORMATS=html html-split' 'DESTDIR=${DESTDIR}/data/tutorials/$${.CURDIR:T}' ${.TARGET:S/afterinstall/install/}) - (cd ../../../doc/en_US.ISO_8859-1/books/fdp-primer; make 'FORMATS=html html-split' DESTDIR=${DESTDIR}/data/tutorials/docproj-primer ${.TARGET:S/afterinstall/install/}) + (cd ../../../doc/en_US.ISO_8859-1/articles && make 'FORMATS=html html-split' 'DESTDIR=${DESTDIR}/data/tutorials/$${.CURDIR:T}' ${.TARGET:S/afterinstall/install/}) + (cd ../../../doc/en_US.ISO_8859-1/books/fdp-primer && make 'FORMATS=html html-split' DESTDIR=${DESTDIR}/data/tutorials/docproj-primer ${.TARGET:S/afterinstall/install/}) .include "../web.mk" diff --git a/en/web.mk b/en/web.mk index 7e2ff45848..6cec9f0be1 100644 --- a/en/web.mk +++ b/en/web.mk @@ -1,209 +1,209 @@ # bsd.web.mk -# $Id: web.mk,v 1.21 1999-08-19 20:40:26 nik Exp $ +# $Id: web.mk,v 1.22 1999-09-03 14:01:11 kuriyama Exp $ # # Build and install a web site. # # Basic targets: # # all (default) -- performs batch mode processing necessary # install -- Installs everything # clean -- remove anything generated by processing # .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif WEBDIR?= ${.CURDIR:T} CGIDIR?= ${.CURDIR:T} DESTDIR?= ${HOME}/public_html WEBOWN?= ${USER} WEBGRP?= www WEBMODE?= 664 CGIOWN?= ${USER} CGIGRP?= www CGIMODE?= 775 # # Install dirs derived from the above. # DOCINSTALLDIR= ${DESTDIR}${WEBBASE}/${WEBDIR} CGIINSTALLDIR= ${DESTDIR}${WEBBASE}/${CGIDIR} # # The orphan list contains sources specified in DOCS that there # is no transform rule for. We start out with all of them, and # each rule below removes the ones it knows about. If any are # left over at the end, the user is warned about them. # ORPHANS:= ${DOCS} COPY= -C # # Where the ports live, if CVS isn't used (ie. NOPORTSCVS is defined) # PORTSBASE?= /usr ################################################################## # Transformation rules ### # file.sgml --> file.html # # Runs file.sgml through spam to validate and expand some entity # references are expanded. file.html is added to the list of # things to install. .SUFFIXES: .sgml .html SGMLNORM= sgmlnorm CATALOG?= /usr/local/share/sgml/html/catalog SGMLNORMFLAGS= -d ${SGMLNORMOPTS} -c ${CATALOG} GENDOCS+= ${DOCS:M*.sgml:S/.sgml$/.html/g} ORPHANS:= ${ORPHANS:N*.sgml} .sgml.html: ${SGMLNORM} ${SGMLNORMFLAGS} ${.IMPSRC} > ${.TARGET} ### # file.docb --> file.html # # Generate HTML from docbook .SUFFIXES: .docb GENDOCS+= ${DOCS:M*.docb:S/.docb$/.html/g} ORPHANS:= ${ORPHANS:N*.docb} .docb.html: sgmlfmt -d docbook -f html ${SGMLOPTS} ${.IMPSRC} ################################################################## # Targets # # If no target is specified, .MAIN is made # .MAIN: all # # Build most everything # all: ${COOKIE} orphans ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR # # Warn about anything in DOCS that has no translation # .if !empty(ORPHANS) orphans: @echo Warning! I don\'t know what to do with: ${ORPHANS} .else orphans: .endif # # Clean things up # .if !target(clean) clean: _PROGSUBDIR rm -f Errs errs mklog ${GENDOCS} ${LOCAL} ${CLEANFILES} .endif # # Really clean things up # .if !target(cleandir) cleandir: clean _PROGSUBDIR rm -f ${.CURDIR}/tags .depend cd ${.CURDIR}; rm -rf obj; .endif # # Install targets: before, real, and after. # .if !target(install) .if !target(beforeinstall) beforeinstall: .endif .if !target(afterinstall) afterinstall: .endif _ALLINSTALL+= ${GENDOCS} ${DATA} ${LOCAL} realinstall: ${COOKIE} ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR .if !empty(_ALLINSTALL) @mkdir -p ${DOCINSTALLDIR} for entry in ${_ALLINSTALL}; do \ ${INSTALL} ${COPY} -o ${WEBOWN} -g ${WEBGRP} -m ${WEBMODE} \ ${INSTALLFLAGS} $${entry} ${DOCINSTALLDIR}; \ done .if defined(INDEXLINK) && !empty(INDEXLINK) (cd ${DOCINSTALLDIR}; ln -s -f ${INDEXLINK} index.html) .endif .endif .if defined(CGI) && !empty(CGI) @mkdir -p ${CGIINSTALLDIR} for entry in ${CGI}; do \ ${INSTALL} ${COPY} -o ${CGIOWN} -g ${CGIGRP} -m ${CGIMODE} \ ${INSTALLFLAGS} $${entry} ${CGIINSTALLDIR}; \ done .endif .if defined(DOCSUBDIR) && !empty(DOCSUBDIR) for entry in ${DOCSUBDIR}; do \ mkdir -p ${DOCINSTALLDIR}/$$entry; \ done .endif # Set up install dependencies so they happen in the correct order. install: afterinstall afterinstall: realinstall2 realinstall: beforeinstall realinstall2: realinstall .endif # # This recursively calls make in subdirectories. # #SUBDIR+=${DOCSUBDIR} _PROGSUBDIR: .USE .if defined(SUBDIR) && !empty(SUBDIR) @for entry in ${SUBDIR}; do \ (${ECHODIR} "===> ${DIRPRFX}$$entry"; \ - cd ${.CURDIR}/$${entry}; \ + cd ${.CURDIR}/$${entry} && \ ${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/); \ done .endif .if defined(DOCSUBDIR) && !empty(DOCSUBDIR) @for entry in ${DOCSUBDIR}; do \ (${ECHODIR} "===> ${DIRPRFX}$$entry"; \ - cd ${.CURDIR}/$${entry}; \ + cd ${.CURDIR}/$${entry} && \ if [ ${WEBDIR} = "data" -a $$entry = "handbook" -o $$entry = "docproj-primer" ]; then \ ${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS} FORMATS="txt html html-split"; \ elif [ $$entry = "handbook" -a ${WEBDIR} = "data/ja" ]; then \ ${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS} FORMATS="html html-split"; \ else \ ${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS}; \ fi); \ done .endif # # cruft for generating linuxdoc stuff # .if defined (DOCSUBDIR) && !empty(DOCSUBDIR) FORMATS?= "html ps latin1 ascii" PARAMS= DESTDIR=${DESTDIR} DOCDIR=${WEBBASE}/${WEBDIR} PARAMS+= DOCOWN=${WEBOWN} DOCGRP=${WEBGRP} PARAMS+= FORMATS=${FORMATS} COPY="${COPY}" PARAMS+= SGMLOPTS="${SGMLOPTS}" .endif # THE END diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk index 3c397940ba..72e813ae58 100644 --- a/share/mk/web.site.mk +++ b/share/mk/web.site.mk @@ -1,209 +1,209 @@ # bsd.web.mk -# $Id: web.site.mk,v 1.21 1999-08-19 20:40:26 nik Exp $ +# $Id: web.site.mk,v 1.22 1999-09-03 14:01:11 kuriyama Exp $ # # Build and install a web site. # # Basic targets: # # all (default) -- performs batch mode processing necessary # install -- Installs everything # clean -- remove anything generated by processing # .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif WEBDIR?= ${.CURDIR:T} CGIDIR?= ${.CURDIR:T} DESTDIR?= ${HOME}/public_html WEBOWN?= ${USER} WEBGRP?= www WEBMODE?= 664 CGIOWN?= ${USER} CGIGRP?= www CGIMODE?= 775 # # Install dirs derived from the above. # DOCINSTALLDIR= ${DESTDIR}${WEBBASE}/${WEBDIR} CGIINSTALLDIR= ${DESTDIR}${WEBBASE}/${CGIDIR} # # The orphan list contains sources specified in DOCS that there # is no transform rule for. We start out with all of them, and # each rule below removes the ones it knows about. If any are # left over at the end, the user is warned about them. # ORPHANS:= ${DOCS} COPY= -C # # Where the ports live, if CVS isn't used (ie. NOPORTSCVS is defined) # PORTSBASE?= /usr ################################################################## # Transformation rules ### # file.sgml --> file.html # # Runs file.sgml through spam to validate and expand some entity # references are expanded. file.html is added to the list of # things to install. .SUFFIXES: .sgml .html SGMLNORM= sgmlnorm CATALOG?= /usr/local/share/sgml/html/catalog SGMLNORMFLAGS= -d ${SGMLNORMOPTS} -c ${CATALOG} GENDOCS+= ${DOCS:M*.sgml:S/.sgml$/.html/g} ORPHANS:= ${ORPHANS:N*.sgml} .sgml.html: ${SGMLNORM} ${SGMLNORMFLAGS} ${.IMPSRC} > ${.TARGET} ### # file.docb --> file.html # # Generate HTML from docbook .SUFFIXES: .docb GENDOCS+= ${DOCS:M*.docb:S/.docb$/.html/g} ORPHANS:= ${ORPHANS:N*.docb} .docb.html: sgmlfmt -d docbook -f html ${SGMLOPTS} ${.IMPSRC} ################################################################## # Targets # # If no target is specified, .MAIN is made # .MAIN: all # # Build most everything # all: ${COOKIE} orphans ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR # # Warn about anything in DOCS that has no translation # .if !empty(ORPHANS) orphans: @echo Warning! I don\'t know what to do with: ${ORPHANS} .else orphans: .endif # # Clean things up # .if !target(clean) clean: _PROGSUBDIR rm -f Errs errs mklog ${GENDOCS} ${LOCAL} ${CLEANFILES} .endif # # Really clean things up # .if !target(cleandir) cleandir: clean _PROGSUBDIR rm -f ${.CURDIR}/tags .depend cd ${.CURDIR}; rm -rf obj; .endif # # Install targets: before, real, and after. # .if !target(install) .if !target(beforeinstall) beforeinstall: .endif .if !target(afterinstall) afterinstall: .endif _ALLINSTALL+= ${GENDOCS} ${DATA} ${LOCAL} realinstall: ${COOKIE} ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR .if !empty(_ALLINSTALL) @mkdir -p ${DOCINSTALLDIR} for entry in ${_ALLINSTALL}; do \ ${INSTALL} ${COPY} -o ${WEBOWN} -g ${WEBGRP} -m ${WEBMODE} \ ${INSTALLFLAGS} $${entry} ${DOCINSTALLDIR}; \ done .if defined(INDEXLINK) && !empty(INDEXLINK) (cd ${DOCINSTALLDIR}; ln -s -f ${INDEXLINK} index.html) .endif .endif .if defined(CGI) && !empty(CGI) @mkdir -p ${CGIINSTALLDIR} for entry in ${CGI}; do \ ${INSTALL} ${COPY} -o ${CGIOWN} -g ${CGIGRP} -m ${CGIMODE} \ ${INSTALLFLAGS} $${entry} ${CGIINSTALLDIR}; \ done .endif .if defined(DOCSUBDIR) && !empty(DOCSUBDIR) for entry in ${DOCSUBDIR}; do \ mkdir -p ${DOCINSTALLDIR}/$$entry; \ done .endif # Set up install dependencies so they happen in the correct order. install: afterinstall afterinstall: realinstall2 realinstall: beforeinstall realinstall2: realinstall .endif # # This recursively calls make in subdirectories. # #SUBDIR+=${DOCSUBDIR} _PROGSUBDIR: .USE .if defined(SUBDIR) && !empty(SUBDIR) @for entry in ${SUBDIR}; do \ (${ECHODIR} "===> ${DIRPRFX}$$entry"; \ - cd ${.CURDIR}/$${entry}; \ + cd ${.CURDIR}/$${entry} && \ ${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/); \ done .endif .if defined(DOCSUBDIR) && !empty(DOCSUBDIR) @for entry in ${DOCSUBDIR}; do \ (${ECHODIR} "===> ${DIRPRFX}$$entry"; \ - cd ${.CURDIR}/$${entry}; \ + cd ${.CURDIR}/$${entry} && \ if [ ${WEBDIR} = "data" -a $$entry = "handbook" -o $$entry = "docproj-primer" ]; then \ ${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS} FORMATS="txt html html-split"; \ elif [ $$entry = "handbook" -a ${WEBDIR} = "data/ja" ]; then \ ${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS} FORMATS="html html-split"; \ else \ ${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS}; \ fi); \ done .endif # # cruft for generating linuxdoc stuff # .if defined (DOCSUBDIR) && !empty(DOCSUBDIR) FORMATS?= "html ps latin1 ascii" PARAMS= DESTDIR=${DESTDIR} DOCDIR=${WEBBASE}/${WEBDIR} PARAMS+= DOCOWN=${WEBOWN} DOCGRP=${WEBGRP} PARAMS+= FORMATS=${FORMATS} COPY="${COPY}" PARAMS+= SGMLOPTS="${SGMLOPTS}" .endif # THE END