Fri Dec 17 00:32:25 PST 2004
- Previous message: [Slony1-commit] By cbbrowne: Added full Slonik reference in DocBook form, along with a
- Next message: [Slony1-commit] By darcyb: make the features in the previous commit available
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message: ----------- More build environment changes to better support cbrowne's docbook work. Modified Files: -------------- slony1-engine: Makefile.global.in (r1.19 -> r1.20) configure.ac (r1.36 -> r1.37) slony1-engine/doc: Makefile (r1.9 -> r1.10) slony1-engine/doc/adminguide: Makefile (r1.2 -> r1.3) -------------- next part -------------- Index: Makefile.global.in =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/Makefile.global.in,v retrieving revision 1.19 retrieving revision 1.20 diff -LMakefile.global.in -LMakefile.global.in -u -w -r1.19 -r1.20 --- Makefile.global.in +++ Makefile.global.in @@ -50,6 +50,7 @@ DJPEG = @DJPEG@ GROFF = @GROFF@ PNMTOPS = @PNMTOPS@ +TAR = @TAR@ subdir=$(slony_subdir) Index: configure.ac =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure.ac,v retrieving revision 1.36 retrieving revision 1.37 diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.36 -r1.37 --- configure.ac +++ configure.ac @@ -1,3 +1,4 @@ + # ---------- # configure.ac # @@ -59,6 +60,8 @@ AC_PROG_LD AC_PROG_LEX AC_PROG_YACC +AC_PATH_PROG(TAR, tar) + AC_SUBST(LD) AC_SUBST(CC) AC_SUBST(YACC) Index: Makefile =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -Ldoc/Makefile -Ldoc/Makefile -u -w -r1.9 -r1.10 --- doc/Makefile +++ doc/Makefile @@ -32,3 +32,10 @@ @for subdir in $(SUBDIRS) ; do \ $(MAKE) -C $$subdir distdir ; \ done + +adminguide.tar: + + $(MAKE) -C adminguide clean + $(MAKE) -C adminguide html + $(MAKE) -C adminguide html JADEFLAGS='-V html-manifest' + cd adminguide && $(TAR) -cf ../$@ `cat HTML.manifest` `echo *.gif | grep -v '\*'` *.css Index: Makefile =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -Ldoc/adminguide/Makefile -Ldoc/adminguide/Makefile -u -w -r1.2 -r1.3 --- doc/adminguide/Makefile +++ doc/adminguide/Makefile @@ -7,7 +7,9 @@ #---------------------------------------------------------------------------- subdir = doc/adminguide -top_builddir = ../.. +slony_top_builddir = ../.. + +include $(slony_top_builddir)/Makefile.global .SECONDARY: .NOTPARALLEL: @@ -16,36 +18,10 @@ COLLATEINDEX = /usr/bin/collateindex.pl endif -ifndef JADE -JADE = jade -endif -SGMLINCLUDE = -D $(srcdir) - -# If this is a vpath build, some generated SGML will be in the build -# tree, so we need to make sure we look there as well as in the -# source tree -ifeq ($(vpath_build), yes) -SGMLINCLUDE += -D . -endif - -ifndef NSGMLS -NSGMLS = nsgmls -endif - -ifndef SGMLSPL -SGMLSPL = sgmlspl -endif - -CONVERT = convert -EPSTOPDF = epstopdf - -# docbook2man generates man pages from docbook refentry source code. -D2MSCRIPT= $(D2MDIR)/docbook2man-spec.pl - GENERATED_SGML = bookindex.sgml -ALLSGML := $(wildcard $(srcdir)/*.sgml $(srcdir)/ref/*.sgml) $(GENERATED_SGML) +ALLSGML := $(wildcard $(srcdir)/*.sgml $(GENERATED_SGML)) ifdef DOCBOOKSTYLE CATALOG = -c $(DOCBOOKSTYLE)/catalog @@ -84,14 +60,17 @@ .PHONY: html +ifndef JADE +html: + @echo "You must have jade installed to build the documentation." && exit; +else html: slony.sgml $(ALLSGML) stylesheet.dsl @rm -f *.html - $(JADE) -ioutput.html -d mysheet.dsl -t sgml $< - #$(JADE) $(JADEFLAGS) $(SPFLAGS) $(SGMLINCLUDE) $(CATALOG) -d mysheet.dsl -ioutput-html -t sgml $< + $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d mysheet.dsl -ioutput-html -t sgml $< ifeq ($(vpath_build), yes) @cp $(srcdir)/stylesheet.css . endif - +endif COLLATEINDEX := LC_ALL=C $(PERL) $(COLLATEINDEX) -f -g
- Previous message: [Slony1-commit] By cbbrowne: Added full Slonik reference in DocBook form, along with a
- Next message: [Slony1-commit] By darcyb: make the features in the previous commit available
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list