From: Peter Eisentraut Date: Tue, 18 Sep 2001 12:08:27 +0000 (+0000) Subject: Generate index.html as the root file name of the documentation set, X-Git-Tag: REL7_2_BETA1~372 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a4abd4232cfc31c8d7052a1984ee4f51cd7d04c;p=postgresql Generate index.html as the root file name of the documentation set, rather than making index.html a symlink to the autogenerated name. Fixes fatal problems with tar programs that don't handle symlinks very well (MacOS X). (The names user.html, admin.html, etc. are still available as make targets, but they aren't packaged anymore.) Use the manifest file that the stylesheets generate as the file list for packaging. Put graphics in the right place while building, not while packaging, so you can actually look at them after building. --- diff --git a/doc/src/Makefile b/doc/src/Makefile index a964fce176..4c8c56cba7 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 293fb6e760..bf3c70f853 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 fcae77758a..a2d2395f91 100644 --- a/doc/src/sgml/plsql.sgml +++ b/doc/src/sgml/plsql.sgml @@ -1,5 +1,5 @@ @@ -1715,13 +1715,15 @@ CREATE FUNCTION c_overpaid (EMP, integer) RETURNS boolean AS ' - + Porting from Oracle PL/SQL diff --git a/doc/src/sgml/stylesheet.dsl b/doc/src/sgml/stylesheet.dsl index 5ba9550731..d3fa0ba20d 100644 --- a/doc/src/sgml/stylesheet.dsl +++ b/doc/src/sgml/stylesheet.dsl @@ -1,4 +1,4 @@ - + @@ -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")