diff options
| -rw-r--r-- | doc/src/Makefile | 36 | ||||
| -rw-r--r-- | doc/src/sgml/Makefile | 15 | ||||
| -rw-r--r-- | doc/src/sgml/plsql.sgml | 6 | ||||
| -rw-r--r-- | doc/src/sgml/stylesheet.dsl | 3 |
4 files changed, 23 insertions, 37 deletions
diff --git a/doc/src/Makefile b/doc/src/Makefile index a964fce1766..4c8c56cba7c 100644 --- a/doc/src/Makefile +++ b/doc/src/Makefile @@ -1,16 +1,15 @@ # Postgres documentation makefile -# $Header: /cvsroot/pgsql/doc/src/Makefile,v 1.21 2001/09/17 23:00:27 petere Exp $ +# $Header: /cvsroot/pgsql/doc/src/Makefile,v 1.22 2001/09/18 12:08:26 petere Exp $ subdir = doc/src top_builddir = ../.. include $(top_builddir)/src/Makefile.global ZIPSUFFIX= gz -TAREXCLUDE= --exclude=Makefile --exclude='*.sgml' --exclude=ref -SRC= admin developer reference programmer tutorial user postgres +BOOKS = admin developer reference programmer tutorial user postgres -TARGETS= $(SRC:%=%.tar.$(ZIPSUFFIX)) +TARGETS= $(BOOKS:%=%.tar.$(ZIPSUFFIX)) .PRECIOUS: .PHONY: install all sources clean distclean @@ -33,33 +32,12 @@ sources: sources.tar: $(TAR) -cf $@ sgml graphics -admin.tar developer.tar reference.tar user.tar: +$(addsuffix .tar, $(BOOKS)): $(MAKE) -C sgml clean $(MAKE) -C sgml $(basename $@).html - $(MAKE) -C sgml $(basename $@).html - cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.css - -programmer.tar: - $(MAKE) -C sgml clean - $(MAKE) -C sgml programmer.html - $(MAKE) -C sgml programmer.html - abssrcdir=`cd $(srcdir) && pwd`; \ - cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.css -C $$abssrcdir/graphics catalogs.gif connections.gif - -tutorial.tar: - $(MAKE) -C sgml clean - $(MAKE) -C sgml tutorial.html - $(MAKE) -C sgml tutorial.html - abssrcdir=`cd $(srcdir) && pwd`; \ - cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.css -C $$abssrcdir/graphics clientserver.gif - -postgres.tar: - $(MAKE) -C sgml clean - $(MAKE) -C sgml postgres.html - $(MAKE) -C sgml postgres.html - abssrcdir=`cd $(srcdir) && pwd`; \ - cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html *.css -C $$abssrcdir/graphics catalogs.gif clientserver.gif connections.gif + $(MAKE) -C sgml $(basename $@).html JADEFLAGS='-V html-manifest' + cd sgml && $(TAR) -c -f ../$@ -T HTML.manifest *.gif *.css man.tar: $(MAKE) -C sgml man - $(TAR) -cf $@ -C sgml man1 man$(sqlmansect_dummy) + $(TAR) -c -f $@ -C sgml man1 man$(sqlmansect_dummy) diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile index 293fb6e7606..bf3c70f8538 100644 --- a/doc/src/sgml/Makefile +++ b/doc/src/sgml/Makefile @@ -8,7 +8,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.38 2001/08/29 19:14:39 petere Exp $ +# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.39 2001/09/18 12:08:26 petere Exp $ # #---------------------------------------------------------------------------- @@ -82,12 +82,17 @@ JADE.html = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) -c $(CATALOG) -d stylesheet.dsl postgres.html: postgres.sgml $(ALLSGML) stylesheet.dsl @rm -f *.html $(JADE.html) $< - ln -sf $@ index.html + ln -sf index.html $@ $(addsuffix .html, $(ALLBOOKS)): %.html: %.sgml $(ALLSGML) stylesheet.dsl @rm -f *.html $(JADE.html) book-decl.sgml $< - ln -sf $@ index.html + ln -sf index.html $@ + +tutorial.html: clientserver.gif +programmer.html: catalogs.gif connections.gif +postgres.html: clientserver.gif catalogs.gif connections.gif + COLLATEINDEX = $(PERL) $(DOCBOOKSTYLE)/bin/collateindex.pl -f -g -t 'Index' @@ -134,7 +139,7 @@ $(addsuffix .tex, $(ALLBOOKS)): %.tex: %.sgml $(ALLSGML) stylesheet.dsl # Graphics %.gif: - cp -p ../graphics/$@ . + cp $(srcdir)/../graphics/$@ . ## @@ -179,7 +184,7 @@ check-postgres: postgres.sgml clean distclean maintainer-clean: # HTML - rm -f HTML.manifest *.html + rm -f HTML.manifest *.html *.gif # man rm -rf *.1 *.$(DEFAULTSECTION) man1 man$(DEFAULTSECTION) manpage.refs manpage.links manpage.log # print diff --git a/doc/src/sgml/plsql.sgml b/doc/src/sgml/plsql.sgml index fcae77758a3..a2d2395f915 100644 --- a/doc/src/sgml/plsql.sgml +++ b/doc/src/sgml/plsql.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/Attic/plsql.sgml,v 2.39 2001/09/13 15:55:23 petere Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/Attic/plsql.sgml,v 2.40 2001/09/18 12:08:26 petere Exp $ --> <chapter id="plpgsql"> @@ -1715,13 +1715,15 @@ CREATE FUNCTION c_overpaid (EMP, integer) RETURNS boolean AS ' </address> </affiliation> </author> - +<!-- + Breaks HTML manifest file <legalnotice> <para> Except for portions of this document quoted from other sources, this document is licensed under the BSD License. </para> </legalnotice> +--> </sect1info> <title>Porting from Oracle PL/SQL</title> diff --git a/doc/src/sgml/stylesheet.dsl b/doc/src/sgml/stylesheet.dsl index 5ba95507311..d3fa0ba20db 100644 --- a/doc/src/sgml/stylesheet.dsl +++ b/doc/src/sgml/stylesheet.dsl @@ -1,4 +1,4 @@ -<!-- $Header: /cvsroot/pgsql/doc/src/sgml/stylesheet.dsl,v 1.10 2001/09/15 00:48:59 petere Exp $ --> +<!-- $Header: /cvsroot/pgsql/doc/src/sgml/stylesheet.dsl,v 1.11 2001/09/18 12:08:27 petere Exp $ --> <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ <!-- must turn on one of these with -i on the jade command line --> @@ -44,6 +44,7 @@ (define %section-autolabel% #t) (define %generate-legalnotice-link% #t) (define %html-ext% ".html") +(define %root-filename% "index") (define %link-mailto-url% (string-append "mailto:" pgsql-docs-list)) (define %use-id-as-filename% #t) (define %stylesheet% "stylesheet.css") |