diff --git a/data/Makefile b/data/Makefile index 10bde5fcf5..0958151432 100644 --- a/data/Makefile +++ b/data/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.19 1997-06-30 06:30:17 jkh Exp $ +# $Id: Makefile,v 1.20 1998-01-18 22:27:30 jfieber Exp $ .if exists(Makefile.conf) .include "Makefile.conf" @@ -25,7 +25,7 @@ DATA= COPYING COPYING.LIB README.mirror robots.txt index.html # Files or targets listed here are defined in this file. -LOCAL= stats.html stats-img.html +#LOCAL= stats.html stats-img.html stats.html: ${ACCESS_LOG_DIR}/${ACCESS_LOG_FILE} renice +10 $$$$; \ @@ -52,11 +52,7 @@ SUBDIR= cgi commercial gifs ports releases tutorials ja_JP.EUC # . DOCSUBDIR= FAQ handbook - -# Directories that need to be checked out from the -# CVS repository. - -CVSDIR= FAQ handbook +SGMLOPTS+= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr WEBDIR= data diff --git a/data/Makefile.inc b/data/Makefile.inc index bf9ec4e9f2..c44a0696a1 100644 --- a/data/Makefile.inc +++ b/data/Makefile.inc @@ -1,4 +1,3 @@ -# $Id: Makefile.inc,v 1.5 1997-07-01 03:51:59 max Exp $ +# $Id: Makefile.inc,v 1.6 1998-01-18 22:27:30 jfieber Exp $ WEBBASE?= /data -SGMLOPTS+= -links -hdr ${.CURDIR}/../doc.hdr -ftr ${.CURDIR}/../doc.ftr diff --git a/data/ja_JP.EUC/Makefile b/data/ja_JP.EUC/Makefile index e8d82ff1b9..9d424f8a32 100644 --- a/data/ja_JP.EUC/Makefile +++ b/data/ja_JP.EUC/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.6 1998-01-01 19:38:26 max Exp $ +# $Id: Makefile,v 1.7 1998-01-18 22:27:36 jfieber Exp $ # The FreeBSD Japanese Documentation Project # Original revision: 1.19 @@ -39,11 +39,8 @@ SUBDIR= ports releases DOCSUBDIR= FAQ handbook FORMATS?= "html roff" +SGMLOPTS= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr -# Directories that need to be checked out from the -# CVS repository. - -#CVSDIR= FAQ handbook WEBDIR= ja_JP.EUC diff --git a/data/ja_JP.EUC/Makefile.inc b/data/ja_JP.EUC/Makefile.inc index 9070a7b704..e0e9bd6b40 100644 --- a/data/ja_JP.EUC/Makefile.inc +++ b/data/ja_JP.EUC/Makefile.inc @@ -1,6 +1,5 @@ -# $Id: Makefile.inc,v 1.3 1997-11-23 22:55:07 max Exp $ +# $Id: Makefile.inc,v 1.4 1998-01-18 22:27:37 jfieber Exp $ # The FreeBSD Japanese Documentation Project # Original revision: 1.5 WEBBASE?= /data/ja_JP.EUC -SGMLOPTS+= -links -hdr ${.CURDIR}/../doc.hdr -ftr ${.CURDIR}/../doc.ftr diff --git a/data/ja_JP.EUC/ports/Makefile b/data/ja_JP.EUC/ports/Makefile index ba0e4731fc..6858197d54 100644 --- a/data/ja_JP.EUC/ports/Makefile +++ b/data/ja_JP.EUC/ports/Makefile @@ -1,18 +1,20 @@ -# $Id: Makefile,v 1.2 1997-12-07 15:44:05 max Exp $ +# $Id: Makefile,v 1.3 1998-01-18 22:27:40 jfieber Exp $ # The FreeBSD Japanese Documentation Project # Original revision: 1.4 PORTINDEX= ./portindex -INDEX= ../../ports/ports/INDEX -#CVSDIR= ports/INDEX +INDEX= ports/INDEX -COOKIE= cvsdir Makefile.gen +COOKIE= index Makefile.gen .if exists(Makefile.gen) .include "Makefile.gen" CLEANFILES+= ${DOCS} Makefile.gen .endif +index: + cvs co ${INDEX} + Makefile.gen: index.sgml .NOTMAIN echo DOCS= *.sgml > Makefile.gen ${MAKE} ${MAKEFLAGS} ${.IMPSRC} diff --git a/data/ports/Makefile b/data/ports/Makefile index c26d866bfe..c8335275b2 100644 --- a/data/ports/Makefile +++ b/data/ports/Makefile @@ -1,16 +1,18 @@ -# $Id: Makefile,v 1.4 1997-04-23 22:23:02 jfieber Exp $ +# $Id: Makefile,v 1.5 1998-01-18 22:27:42 jfieber Exp $ PORTINDEX= ./portindex INDEX= ports/INDEX -CVSDIR= ports/INDEX -COOKIE= cvsdir Makefile.gen +COOKIE= index Makefile.gen .if exists(Makefile.gen) .include "Makefile.gen" CLEANFILES+= ${DOCS} Makefile.gen .endif +index: + cvs co ${INDEX} + Makefile.gen: index.sgml .NOTMAIN echo DOCS= *.sgml > Makefile.gen ${MAKE} ${MAKEFLAGS} ${.IMPSRC} diff --git a/data/tutorials/Makefile b/data/tutorials/Makefile index 0434928bee..d89b4c97ac 100644 --- a/data/tutorials/Makefile +++ b/data/tutorials/Makefile @@ -1,8 +1,10 @@ -# $Id: Makefile,v 1.11 1997-09-13 04:24:09 jfieber Exp $ +# $Id: Makefile,v 1.12 1998-01-18 22:27:43 jfieber Exp $ DOCS?= index.sgml SUBDIR= devel diskformat disklessx fonts mh multios newuser upgrade DOCSUBDIR= ddwg ppp +SGMLOPTS+= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr + .if defined $(NEW_BUILD) SUBDIR= diff --git a/data/web.mk b/data/web.mk index 7b4e9bf795..7e5de9074d 100644 --- a/data/web.mk +++ b/data/web.mk @@ -1,5 +1,5 @@ # bsd.web.mk -# $Id: web.mk,v 1.12 1997-11-11 15:09:24 brian Exp $ +# $Id: web.mk,v 1.13 1998-01-18 22:27:31 jfieber Exp $ # # Build and install a web site. @@ -10,12 +10,6 @@ # install -- Installs everything # clean -- remove anything generated by processing # -# Transformations: -# -# copy -- no processing, simply copy the file to install -# spam -- run the file through spam for processing and validation -# m4 -- run through the m4 macro processor -# .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" @@ -47,7 +41,7 @@ CGIINSTALLDIR= ${DESTDIR}${WEBBASE}/${CGIDIR} # ORPHANS:= ${DOCS} -COPY= -c +COPY= -C ################################################################## # Transformation rules @@ -81,44 +75,6 @@ ORPHANS:= ${ORPHANS:N*.docb} .docb.html: sgmlfmt -d docbook -f html ${SGMLOPTS} ${.IMPSRC} -### -# file.java --> file.class -# -# Uses javac to compile java source. Note: since we cannot tell -# what classes will come out of a java file, we have install all -# .class files. The .if construction is there so that *.class -# is only put in if there are actually java files in the DOCS. -# Generally speaking, make and java were not made for each other. - -.SUFFIXES: .java .class -JAVAC?= javac -JAVAFLAGS= ${JAVAOPTS} -_TMP:= ${DOCS:M*.java} -.if !empty(_TMP) -GENDOCS+= ${DOCS:M*.java:S/.java$/.class/g} *.class -.endif -ORPHANS:= ${ORPHANS:N*.java} - -.java.class: - ${JAVAC} ${JAVAFLAGS} ${.IMPSRC} - - -### -# file.m4 --> file.html -# -# Runs file.m4 through the m4 preprocessor, generating file.sgml, -# which is then taken care of by the .sgml to .html rule. - -.SUFFIXES: .m4 -M4?= m4 -M4FLAGS?= ${M4OPTS} -GENDOCS+= ${DOCS:M*.m4:S/.m4$/.html/g} -CLEANFILES+= ${DOCS:M*.m4:S/.m4$/.sgml/g} -ORPHANS:= ${ORPHANS:N*.m4} - -.m4.sgml: - ${M4} ${M4OPTS} < ${.IMPSRC} > ${.TARGET} - ################################################################## # Targets @@ -131,7 +87,7 @@ ORPHANS:= ${ORPHANS:N*.m4} # # Build most everything # -all: ${COOKIE} orphans cvsdir ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR +all: ${COOKIE} orphans ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR # # Warn about anything in DOCS that has no translation @@ -143,18 +99,6 @@ orphans: orphans: .endif -# -# Check these things out from cvs -# -cvsdir: -.if defined(CVSDIR) && !empty(CVSDIR) - for i in ${CVSDIR}; do \ - if [ ! -e $$i ]; then \ - cvs co -P $$i; \ - fi \ - done -.endif - # # Clean things up # @@ -256,6 +200,7 @@ 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 diff --git a/en/Makefile b/en/Makefile index 10bde5fcf5..0958151432 100644 --- a/en/Makefile +++ b/en/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.19 1997-06-30 06:30:17 jkh Exp $ +# $Id: Makefile,v 1.20 1998-01-18 22:27:30 jfieber Exp $ .if exists(Makefile.conf) .include "Makefile.conf" @@ -25,7 +25,7 @@ DATA= COPYING COPYING.LIB README.mirror robots.txt index.html # Files or targets listed here are defined in this file. -LOCAL= stats.html stats-img.html +#LOCAL= stats.html stats-img.html stats.html: ${ACCESS_LOG_DIR}/${ACCESS_LOG_FILE} renice +10 $$$$; \ @@ -52,11 +52,7 @@ SUBDIR= cgi commercial gifs ports releases tutorials ja_JP.EUC # . DOCSUBDIR= FAQ handbook - -# Directories that need to be checked out from the -# CVS repository. - -CVSDIR= FAQ handbook +SGMLOPTS+= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr WEBDIR= data diff --git a/en/Makefile.inc b/en/Makefile.inc index bf9ec4e9f2..c44a0696a1 100644 --- a/en/Makefile.inc +++ b/en/Makefile.inc @@ -1,4 +1,3 @@ -# $Id: Makefile.inc,v 1.5 1997-07-01 03:51:59 max Exp $ +# $Id: Makefile.inc,v 1.6 1998-01-18 22:27:30 jfieber Exp $ WEBBASE?= /data -SGMLOPTS+= -links -hdr ${.CURDIR}/../doc.hdr -ftr ${.CURDIR}/../doc.ftr diff --git a/en/ports/Makefile b/en/ports/Makefile index c26d866bfe..c8335275b2 100644 --- a/en/ports/Makefile +++ b/en/ports/Makefile @@ -1,16 +1,18 @@ -# $Id: Makefile,v 1.4 1997-04-23 22:23:02 jfieber Exp $ +# $Id: Makefile,v 1.5 1998-01-18 22:27:42 jfieber Exp $ PORTINDEX= ./portindex INDEX= ports/INDEX -CVSDIR= ports/INDEX -COOKIE= cvsdir Makefile.gen +COOKIE= index Makefile.gen .if exists(Makefile.gen) .include "Makefile.gen" CLEANFILES+= ${DOCS} Makefile.gen .endif +index: + cvs co ${INDEX} + Makefile.gen: index.sgml .NOTMAIN echo DOCS= *.sgml > Makefile.gen ${MAKE} ${MAKEFLAGS} ${.IMPSRC} diff --git a/en/web.mk b/en/web.mk index 7b4e9bf795..7e5de9074d 100644 --- a/en/web.mk +++ b/en/web.mk @@ -1,5 +1,5 @@ # bsd.web.mk -# $Id: web.mk,v 1.12 1997-11-11 15:09:24 brian Exp $ +# $Id: web.mk,v 1.13 1998-01-18 22:27:31 jfieber Exp $ # # Build and install a web site. @@ -10,12 +10,6 @@ # install -- Installs everything # clean -- remove anything generated by processing # -# Transformations: -# -# copy -- no processing, simply copy the file to install -# spam -- run the file through spam for processing and validation -# m4 -- run through the m4 macro processor -# .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" @@ -47,7 +41,7 @@ CGIINSTALLDIR= ${DESTDIR}${WEBBASE}/${CGIDIR} # ORPHANS:= ${DOCS} -COPY= -c +COPY= -C ################################################################## # Transformation rules @@ -81,44 +75,6 @@ ORPHANS:= ${ORPHANS:N*.docb} .docb.html: sgmlfmt -d docbook -f html ${SGMLOPTS} ${.IMPSRC} -### -# file.java --> file.class -# -# Uses javac to compile java source. Note: since we cannot tell -# what classes will come out of a java file, we have install all -# .class files. The .if construction is there so that *.class -# is only put in if there are actually java files in the DOCS. -# Generally speaking, make and java were not made for each other. - -.SUFFIXES: .java .class -JAVAC?= javac -JAVAFLAGS= ${JAVAOPTS} -_TMP:= ${DOCS:M*.java} -.if !empty(_TMP) -GENDOCS+= ${DOCS:M*.java:S/.java$/.class/g} *.class -.endif -ORPHANS:= ${ORPHANS:N*.java} - -.java.class: - ${JAVAC} ${JAVAFLAGS} ${.IMPSRC} - - -### -# file.m4 --> file.html -# -# Runs file.m4 through the m4 preprocessor, generating file.sgml, -# which is then taken care of by the .sgml to .html rule. - -.SUFFIXES: .m4 -M4?= m4 -M4FLAGS?= ${M4OPTS} -GENDOCS+= ${DOCS:M*.m4:S/.m4$/.html/g} -CLEANFILES+= ${DOCS:M*.m4:S/.m4$/.sgml/g} -ORPHANS:= ${ORPHANS:N*.m4} - -.m4.sgml: - ${M4} ${M4OPTS} < ${.IMPSRC} > ${.TARGET} - ################################################################## # Targets @@ -131,7 +87,7 @@ ORPHANS:= ${ORPHANS:N*.m4} # # Build most everything # -all: ${COOKIE} orphans cvsdir ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR +all: ${COOKIE} orphans ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR # # Warn about anything in DOCS that has no translation @@ -143,18 +99,6 @@ orphans: orphans: .endif -# -# Check these things out from cvs -# -cvsdir: -.if defined(CVSDIR) && !empty(CVSDIR) - for i in ${CVSDIR}; do \ - if [ ! -e $$i ]; then \ - cvs co -P $$i; \ - fi \ - done -.endif - # # Clean things up # @@ -256,6 +200,7 @@ 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 diff --git a/ja/Makefile b/ja/Makefile index e8d82ff1b9..9d424f8a32 100644 --- a/ja/Makefile +++ b/ja/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.6 1998-01-01 19:38:26 max Exp $ +# $Id: Makefile,v 1.7 1998-01-18 22:27:36 jfieber Exp $ # The FreeBSD Japanese Documentation Project # Original revision: 1.19 @@ -39,11 +39,8 @@ SUBDIR= ports releases DOCSUBDIR= FAQ handbook FORMATS?= "html roff" +SGMLOPTS= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr -# Directories that need to be checked out from the -# CVS repository. - -#CVSDIR= FAQ handbook WEBDIR= ja_JP.EUC diff --git a/ja/Makefile.inc b/ja/Makefile.inc index 9070a7b704..e0e9bd6b40 100644 --- a/ja/Makefile.inc +++ b/ja/Makefile.inc @@ -1,6 +1,5 @@ -# $Id: Makefile.inc,v 1.3 1997-11-23 22:55:07 max Exp $ +# $Id: Makefile.inc,v 1.4 1998-01-18 22:27:37 jfieber Exp $ # The FreeBSD Japanese Documentation Project # Original revision: 1.5 WEBBASE?= /data/ja_JP.EUC -SGMLOPTS+= -links -hdr ${.CURDIR}/../doc.hdr -ftr ${.CURDIR}/../doc.ftr diff --git a/ja/ports/Makefile b/ja/ports/Makefile index ba0e4731fc..6858197d54 100644 --- a/ja/ports/Makefile +++ b/ja/ports/Makefile @@ -1,18 +1,20 @@ -# $Id: Makefile,v 1.2 1997-12-07 15:44:05 max Exp $ +# $Id: Makefile,v 1.3 1998-01-18 22:27:40 jfieber Exp $ # The FreeBSD Japanese Documentation Project # Original revision: 1.4 PORTINDEX= ./portindex -INDEX= ../../ports/ports/INDEX -#CVSDIR= ports/INDEX +INDEX= ports/INDEX -COOKIE= cvsdir Makefile.gen +COOKIE= index Makefile.gen .if exists(Makefile.gen) .include "Makefile.gen" CLEANFILES+= ${DOCS} Makefile.gen .endif +index: + cvs co ${INDEX} + Makefile.gen: index.sgml .NOTMAIN echo DOCS= *.sgml > Makefile.gen ${MAKE} ${MAKEFLAGS} ${.IMPSRC} diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk index d4e9f52c63..89ea7b6362 100644 --- a/share/mk/web.site.mk +++ b/share/mk/web.site.mk @@ -1,5 +1,5 @@ # bsd.web.mk -# $Id: web.site.mk,v 1.12 1997-11-11 15:09:24 brian Exp $ +# $Id: web.site.mk,v 1.13 1998-01-18 22:27:31 jfieber Exp $ # # Build and install a web site. @@ -10,12 +10,6 @@ # install -- Installs everything # clean -- remove anything generated by processing # -# Transformations: -# -# copy -- no processing, simply copy the file to install -# spam -- run the file through spam for processing and validation -# m4 -- run through the m4 macro processor -# .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" @@ -47,7 +41,7 @@ CGIINSTALLDIR= ${DESTDIR}${WEBBASE}/${CGIDIR} # ORPHANS:= ${DOCS} -COPY= -c +COPY= -C ################################################################## # Transformation rules @@ -81,44 +75,6 @@ ORPHANS:= ${ORPHANS:N*.docb} .docb.html: sgmlfmt -d docbook -f html ${SGMLOPTS} ${.IMPSRC} -### -# file.java --> file.class -# -# Uses javac to compile java source. Note: since we cannot tell -# what classes will come out of a java file, we have install all -# .class files. The .if construction is there so that *.class -# is only put in if there are actually java files in the DOCS. -# Generally speaking, make and java were not made for each other. - -.SUFFIXES: .java .class -JAVAC?= javac -JAVAFLAGS= ${JAVAOPTS} -_TMP:= ${DOCS:M*.java} -.if !empty(_TMP) -GENDOCS+= ${DOCS:M*.java:S/.java$/.class/g} *.class -.endif -ORPHANS:= ${ORPHANS:N*.java} - -.java.class: - ${JAVAC} ${JAVAFLAGS} ${.IMPSRC} - - -### -# file.m4 --> file.html -# -# Runs file.m4 through the m4 preprocessor, generating file.sgml, -# which is then taken care of by the .sgml to .html rule. - -.SUFFIXES: .m4 -M4?= m4 -M4FLAGS?= ${M4OPTS} -GENDOCS+= ${DOCS:M*.m4:S/.m4$/.html/g} -CLEANFILES+= ${DOCS:M*.m4:S/.m4$/.sgml/g} -ORPHANS:= ${ORPHANS:N*.m4} - -.m4.sgml: - ${M4} ${M4OPTS} < ${.IMPSRC} > ${.TARGET} - ################################################################## # Targets @@ -131,7 +87,7 @@ ORPHANS:= ${ORPHANS:N*.m4} # # Build most everything # -all: ${COOKIE} orphans cvsdir ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR +all: ${COOKIE} orphans ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR # # Warn about anything in DOCS that has no translation @@ -143,18 +99,6 @@ orphans: orphans: .endif -# -# Check these things out from cvs -# -cvsdir: -.if defined(CVSDIR) && !empty(CVSDIR) - for i in ${CVSDIR}; do \ - if [ ! -e $$i ]; then \ - cvs co -P $$i; \ - fi \ - done -.endif - # # Clean things up # @@ -256,6 +200,7 @@ 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