At present, trying to build the documentation from outside the source
tree (i.e. a "vpath build") fails. This patch fixes that. Two changes
were required:

     - in a vpath build, make sure that we look in the appropriate
       directory in the build tree, not just the source tree (some
       SGML files are auto-generated and aren't found otherwise,
       causing the build to fail)

     - in a vpath build, copy over 'stylesheet.css' from the source
       tree into the build tree. The generated HTML references
       "stylesheet.css", so this makes that work properly.

-Neil
Index: doc/src/sgml/Makefile
===================================================================
RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/Makefile,v
retrieving revision 1.60
diff -c -r1.60 Makefile
*** doc/src/sgml/Makefile	29 Nov 2003 19:51:36 -0000	1.60
--- doc/src/sgml/Makefile	10 Dec 2003 21:34:31 -0000
***************
*** 22,27 ****
--- 22,34 ----
  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
***************
*** 80,85 ****
--- 87,95 ----
  html: postgres.sgml $(ALLSGML) stylesheet.dsl
  	@rm -f *.html
  	$(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -i output-html -t sgml $<
+ ifeq ($(vpath_build), yes)
+ 	@cp $(srcdir)/stylesheet.css .
+ endif
  
  
  COLLATEINDEX := LC_ALL=C $(PERL) $(COLLATEINDEX) -f -g
---------------------------(end of broadcast)---------------------------
TIP 4: Don't 'kill -9' the postmaster

Reply via email to