instead of ${.CURDIR}
. Add 'obj' target depending on _PROGSUBDIR, so 'make obj' for web tree
is processed recursively for SUBDIRs
. Remove 'cleandir' target. bsd.obj.mk declares it unconditionally and
it does absolutely same things. Removing of target from this makefile
reduces spawning of ${MAKE} by factor *6* when called from 'www/en'
directory!
. Move variable declarations from suffix transformation declaration area
to appropriate place
. Move spellcheck target to place where it belongs
. Fix/add some comments
. remove unused (ever used?) docb -> html suffix transformation rule
. remove long time unused ${LOCAL}. It's handled with ${DATA} now.
. extend comment to be more clear
. fail build if ORPHANS check failed. I.e. fail as early as possible.
. remove DIRS_TO_CLEAN related workaround (unused since 2001)
. rewrite "cleandir" target to be more consistent with /usr/share/mk
. remove DOCSUBDIR related logic. Last consumer of this logic (www/zh/FAQ)
was converted to use new methods, so no need to leave this spam
PS: It removes more than 30% of actual logic of this makefile
- The structure of transtable.xml is revised. <word> should be
bracketed with <group>.
- A sorting order of the FreeBSD mirror sites rendered using
mirrors.xml has been determined by sort(1).
- A template "transtable-lookup" has been added for localization on
word-by-word basis.
- Replace English month names in news.xml, press.xml, and
advisories.xml with numbers that correspond to the names.
The number->name translation is performed on the fly.
- Since information in mirrors.xml is used in www/ tree, it depends on
doc/ tree now. When WITHOUT_DOC is defined it can be built without
doc/ tree, but some information becomes unavailable. For example,
a list of the mirror sites generated in index.html becomes a dummy
one, and calling "transtable-lookup" with a word returns the word
itself.
Neither www/ nor doc/ build should be broken due to this commit, but
until the necessary changes are applied in the localized directories,
the transtable does not work; it simply generates non-localized contents
even if transtable.xsl is used.
- Add several templates for index.xsl into includes.misc.xsl.
- The structure of mirrors.xml has been changed; <host> is
a container of <name> and <url> now.
- add doc.common.mk, which defines variables, targets, and
dependencies commonly used in www/ and doc/.
- move www/<lang>/includes.xsl to the language independent
directory and split into several files.
- add transtable*.xsl and transtable.xml to support localized
mirror names.
- make doc/{en_US.ISO8859-1,ja_JP.eucJP}/books/handbook/ use
mirrors.xml (mirrors and eresources).
- make www/{en,ja}/index.xsl use mirrors.xml.
For details, please see doc/share/sgml/README.mirrors for the moment.
Reviewed by: simon and Alex Dupre <sysadmin@alexdupre.com>
web.site.mk includes bsd.subdir.mk via bsd.obj.mk which is responsible
for processing of 'SUBDIR' make variable. But since we are handling
'SUBDIR' here explicitly, doing same thing (second time!) via
bsd.subdir.mk's rules makes no sense and only adds disk IO overhead.
Some numbers... (for 'make -DENGLISH_ONLY -DWEB_ONLY' in www/en):
[before]
$ grep ^=== out.make | wc -l
272
$ grep ^=== out.make | sort -u | wc -l
78
[after]
$ grep ^=== out.make | wc -l
78