Commit graph

31 commits

Author SHA1 Message Date
Nik Clayton
57f6bf9869 Support library images. Do this by
1.  Listing LIB_IMAGES as a dependency on certain targets, to ensure
    that library images are pulled in correctly.

2.  Create a new FORMAT, html.tar, to cater for the case where we might
    be producing a single .html file, but we need to tar that up for
    distribution and the tar file needs to include all the images.

3.  Update the various install-* targets to include the images.

4.  Update the package-* targets to include the images

While I'm here, pull out the .doc target.  For some reason I thought our
tool chain could produce Microsoft Word .doc files.  It can't.
2000-07-16 16:32:27 +00:00
Nik Clayton
03f0782120 Pull in doc.images.mk as necessary.
Also pull in doc.html.mk when DOCFORMAT==html, something I missed from
an earlier commit.
2000-07-16 16:29:18 +00:00
Nik Clayton
f24bb0a201 Image support in the documentation. For the time being, just support
library images (and in particular the callout bugs).
2000-07-16 16:27:30 +00:00
Neil Blakey-Milner
2d8415a9de 1) Use non-relative path to the DSL location, which makes external
document building work again.

2) Add support for building html documents, which is required for
ipsec-must document.
2000-07-14 08:42:49 +00:00
Nik Clayton
2ee393d1be Support infrastructure for HTML documents in the doc/ tree. 2000-06-26 09:04:24 +00:00
Jun Kuriyama
931dd61f12 Do xargs only if HTML.manifest is exist. 2000-04-29 07:46:15 +00:00
Neil Blakey-Milner
4dfd8b3329 Fix the new localized dsl stuff for the obj build case. 2000-03-24 19:31:34 +00:00
Nik Clayton
a595525171 Give each language and encoding it's own freebsd.dsl, to contain style
sheet definitions for that language only.  Each file reads in the defaults
from the master share/sgml/freebsd.dsl file, and adds overrides, or new
definitions, as necessary.

Move the per-language hacks from share/sgml/freebsd.dsl in to
<lang>/share/sgml/freebsd.dsl as necessary.

Add links to the -questions and -doc mailing lists to the bottom of the
generated HTML output for some languages.  The -questions link will
become a link to Greg's "Getting the most from questions" document when
I bring that in, but I haven't done that yet, and I didn't want these
patches hanging around my local tree.

This was the real reason for making freebsd.dsl language local, as it
makes it much easier to translate generated text, such as the text of
the links, without polluting share/sgml/freebsd.dsl.

Update doc.docbook.mk to use the new, per-language freebsd.dsl file when
building the docs.  While I'm here, update .pdb generation so that it
creates a symlink to ${CURDIR:T}.pdb as well (e.g., the Handbook generates
"book.pdb" and "handbook.pdb").  This makes it easier to install more than
one document on a Palm, because two docs called "book.pdb" or "article.pdb"
can not co-exist.
2000-03-23 09:00:17 +00:00
Neil Blakey-Milner
5d2e8b1141 Fix an obj error in the lint/validate target. 2000-03-08 11:21:37 +00:00
Jun Kuriyama
4182f5b9e7 Add NO_TIDY variable to disable tidy.
Tidy cannot handle EUC-JP codepoint range correctly with -raw option.
I will try to fix this problem, but temporary disable to use tidy in
Japanese Handbook and FAQ.
2000-02-03 03:10:43 +00:00
Nik Clayton
8be525f5f5 Allow DSLHTML and DSLPRINT to be overridden ("...=" -> "...?=").
Requested by:	Chris Costello
2000-01-24 20:02:50 +00:00
Nik Clayton
e4fb9fb481 Use w3m instead of lynx to format the text versions. It's table handling
is superior, and the various translation teams are fine with it.

Use iSilo instead of pilot-makedoc to produce Palm compatible files.  It
works from the HTML and retains the formatting (including the internal
links) making it much nicer to work with than the output from pilot-makedoc.
1999-12-24 01:25:27 +00:00
Nik Clayton
85eff2b01e Nuke this. It's been superceded by the doc.*.mk files. It should have
been wiped some time ago.
1999-12-14 16:54:32 +00:00
Nik Clayton
535b364c47 Experimental support for building Palm Pilot DOC format files. The result
works, but isn't great (at least in SmartDOC).  Still, if you want to carry
the FreeBSD FAQ on your Palm (or the Handbook for that matter) it's a start.

PR:             docs/13439
Submitted by:   Slaven Rezic <eserte@cs.tu-berlin.de>
1999-12-13 18:14:41 +00:00
Nik Clayton
ab3a40fe62 Change the invocation of tidy(1) in the index.html target to only update
the .html files that have been built, instead of all of them.  Fixes a bug
where "make FORMATS='html-split html'" would only update the split HTML
files.

Reported by:    Mark Ovens <mark@ukug.uk.FreeBSD.org>
Submitted by:   Neil Blakey-Milner <nbm@mithrandir.moria.org>
1999-11-01 19:41:02 +00:00
Alexey Zelkin
b9ae21e11c Typo fixes
Remove duplicated DOCDIR description in comments
1999-10-13 00:42:21 +00:00
Jesus Rodriguez Cuesta
f8da7adcf2 Fix handbook symlink install problem with old version installed
PR:		docs/14163
Submitted by:	nbm@rucus.ru.ac.za
1999-10-06 14:00:17 +00:00
Wolfram Schneider
40231e0ef1 Use install opiton -C for installing files. 1999-09-09 17:11:28 +00:00
Peter Wemm
5ff728b8ca $Id$ -> $FreeBSD$ 1999-09-06 06:53:43 +00:00
Nik Clayton
7d4a994791 New make(1) infrastructure. Split out docproj.docbook.mk into a number
of smaller doc.<foo>.mk files, reflecting the functionality they contain.
Long overdue, kudos to the submitter for the carrying out the work.

Also makes the files independent of the system include files that
normally live in /usr/share/mk, making it easier for non-FreeBSD systems
to download and build our docs (an important factor in making it easier
to share our work with other projects).

Finally, it (in theory) lets you build the docs with a r/o doc/ directory.

Changes to the submitted files:

doc.docbook.mk    The HTML generation depends on ${DSLHTML}, and the
                  print generation depends on ${DSLPRINT}.  Changing
                  these files will force a rebuild (which makes testing
                  changes a little easier).

                  Removed ${DOC}.doc target.  It's a hangover from when
                  I (mistakenly) thought that Jade could generate MS Word
                  .doc files.

                  Added support for using compress(1) to build .Z files
                  (been on my todo list for ages).

                  Fixed a couple of typos.

Submitted by:   Neil Blakey-Milner <nbm@mithrandr.moria.org>
1999-09-03 17:07:19 +00:00
Nik Clayton
de9128a949 Define new LANGCODE variable, which should contain the language name
and encoding for the documentation that's currently being built (e.g.,
'en_US.ISO_8859-1', or 'es_ES.ISO_8859-1').  Used when building packages
to create part of the package file name.  Setting this involves an
'interesting' kludge -- suggestions for how better to achieve this within
make(1) welcomed.

package-*:
    No need to remove PLIST, it's always overwritten.

    Create empty COMMENT and DESCR files if they don't exist.  Makes it
    easier to test this, without committing COMMENT and DESCR files all
    over the tree.

    Use the ${LANGCODE} variable in the package name.  For example,
    the HTML pkg for the FAQ now looks like faq.en_US.ISO_8859-1.html.tgz,
    instead of just faq.html.tgz.
1999-08-28 09:50:49 +00:00
Nik Clayton
ee685fdd2c 1. Fix a subtle bug in the use of ${DOC}. If you ran make(1) and defined
${FORMATS} on the command line then it would assume that you wanted to
   build a document in the current directory, based on the setting of ${DOC}.
   If ${DOC} wasn't set, it defaulted to the name of the current directory.

   Any Makefile that includes this, and expects to have documentation built
   in the current directory must now explicitly define DOC.  All the current
   ones do anyway.  This should be a non-problem when docproj.docbook.mk is
   split out in to smaller, more modular files.

   Move the comments for DOC from the non-mandatory to the mandatory
   section.

2. Clarify the meaning of DESTDIR, it's changed a little bit since it was
   first documented.

3. Initial, tentative support for building pkg_* packages from the
   formatted documentation.  Needs work, but I've had the patch out for
   review for a couple of days, and no comments either way -- so if
   people hate it, this should at least spur them on to say so.

       # cd /path/to/doc/to/turn/into/a/package
       # touch COMMENT DESCR
       # make 'FORMATS=this that and the other' package

   to build 'n' packages, one per format.  "make install" is run as part
   of the package dependency, so this will overwrite documentation you
   have already got installed.

4. Remove DOC_INSTALL_PREFIX.  Should have been DOCDIR from the start.
1999-08-26 19:37:13 +00:00
Nik Clayton
c98917fd5d Use a conditional assignment "?=" when defining DOC_INSTALL_PREFIX 1999-08-19 00:07:09 +00:00
Nik Clayton
77ab53e851 "-chown" was falling over when ${FORMAT} == html-split. Move the "-" to
the surrounding "for" loop.
1999-08-18 18:46:58 +00:00
Nik Clayton
28ded3fede Add DESTDIR and DOC_INSTALL_PREFIX variables.
Pull in ../Makefile.inc if it exists.

Don't use install(1), use cp(1), chmod(1), and chown(1).  That way non-root
users can install the files without install(1) complaining about the
inability to change the owners.

Nuke the "distribute" target.  We don't need it where we're going. . .
1999-08-16 21:08:12 +00:00
Nik Clayton
537037f404 Make ${INSTALL_COMPRESSED} and ${INSTALL_ONLY_COMPRESSED} truly optional.
PR:             docs/12978
Submitted by:   John Baldwin <jobaldwi@vt.edu>
1999-08-05 20:22:49 +00:00
Nik Clayton
6dd20feada Change ${DOCBOOKCATALOG} to point at the master catalog for all the
DocBook DTDs, not just the 3.0 one.
1999-06-03 19:39:29 +00:00
Nik Clayton
ef198ce9f1 Be smarter about setting DOC_PREFIX to /usr/doc. Only do it if
/usr/doc/share/mk/docproj.docbook.mk exists.  Otherwise, warn the
user they need to set it, and exit.
1999-05-18 17:51:40 +00:00
Nik Clayton
33837abfa5 Added a validate target to check that the SGML markup is valid without
the overhead of running Jade.

Added an ${EXTRA_CATALOGS} variable if your document needs to be
processed with additional SGML catalogs (currently not used by anything,
but might be some day).

Switched the meaning of ${JADEFLAGS} and ${JADEOPTS} for consistency.  All
user-tweakable program options now match ${*FLAGS}.
1999-05-05 20:16:46 +00:00
Jun Kuriyama
8bdee18bd8 Add ${TIDYFLAGS} to use -raw option for building Japanese handbook. 1999-04-20 15:58:36 +00:00
Nik Clayton
ed34512f59 Includable Makefile, contains most of the logic for converting DocBook
into a variety of different formats.  Contains a lot of code that used
to be in doc/en/handbook/Makefile, the commit log for that file will
probably prove useful as well.
1999-04-14 22:13:59 +00:00