Index: doc/src/sgml/Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql/doc/src/sgml/Makefile,v
retrieving revision 1.45
diff -c -c -r1.45 Makefile
*** doc/src/sgml/Makefile	2001/11/18 20:35:02	1.45
--- doc/src/sgml/Makefile	2001/11/22 18:15:16
***************
*** 40,45 ****
--- 40,49 ----
  EPSTOPDF = epstopdf
  
  
+ ifndef COLLATEINDEX
+ COLLATEINDEX = $(PERL) $(DOCBOOKSTYLE)/bin/collateindex.pl 
+ endif
+ 
  # docbook2man generates man pages from docbook refentry source code.
  
  ifndef D2MDIR
***************
*** 96,113 ****
  postgres.html: catalogs.gif connections.gif
  
  
! COLLATEINDEX = $(PERL) $(DOCBOOKSTYLE)/bin/collateindex.pl -f -g -t 'Index'
  
  ifeq (,$(wildcard HTML.index))
  bookindex.sgml:
! 	$(COLLATEINDEX) -o $@ -N
  setindex.sgml:
! 	$(COLLATEINDEX) -x -o $@ -N
  else
  bookindex.sgml: HTML.index
! 	$(COLLATEINDEX) -i 'bookindex' -o $@ $<
  setindex.sgml: HTML.index
! 	$(COLLATEINDEX) -i 'setindex' -x -o $@ $<
  endif
  
  
--- 100,117 ----
  postgres.html: catalogs.gif connections.gif
  
  
! COLLATEINDEXARGS = -f -g -t 'Index'
  
  ifeq (,$(wildcard HTML.index))
  bookindex.sgml:
! 	$(COLLATEINDEX) $(COLLATEINDEXARGS) -o $@ -N
  setindex.sgml:
! 	$(COLLATEINDEX) $(COLLATEINDEXARGS) -x -o $@ -N
  else
  bookindex.sgml: HTML.index
! 	$(COLLATEINDEX) $(COLLATEINDEXARGS) -i 'bookindex' -o $@ $<
  setindex.sgml: HTML.index
! 	$(COLLATEINDEX) $(COLLATEINDEXARGS) -i 'setindex' -x -o $@ $<
  endif