From f2386d7136dacbb8bf59ebbe8e5c5b73db202813 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 22 Mar 2012 00:46:03 -0400 Subject: Fix configure's search for collateindex.pl. PGAC_PATH_COLLATEINDEX supposed that it could use AC_PATH_PROGS to search for collateindex.pl, but that macro will only accept files that are marked executable, and at least some DocBook installations don't mark the script executable (a case the docs Makefile was already prepared for). Accept the script if it's present and readable in $DOCBOOKSTYLE/bin, and otherwise search the PATH as before. Having fixed that up, we don't need the fallback case that was in the docs Makefile, and instead can throw an understandable error if configure didn't find the script. Per recent trouble report from John Lumby. --- doc/src/sgml/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc/src') diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile index 19e640b5d25..04fba434509 100644 --- a/doc/src/sgml/Makefile +++ b/doc/src/sgml/Makefile @@ -27,10 +27,6 @@ all: html man distprep: html distprep-man -ifndef COLLATEINDEX -COLLATEINDEX = $(DOCBOOKSTYLE)/bin/collateindex.pl -endif - ifndef JADE JADE = jade endif @@ -120,7 +116,11 @@ HTML.index: postgres.sgml $(ALMOSTALLSGML) stylesheet.dsl $(JADE.html.call) -V html-index $< bookindex.sgml: HTML.index +ifdef COLLATEINDEX LC_ALL=C $(PERL) $(COLLATEINDEX) -f -g -i 'bookindex' -o $@ $< +else + @$(missing) collateindex.pl $< $@ +endif # Technically, this should depend on Makefile.global, but then # version.sgml would need to be rebuilt after every configure run, -- cgit v1.2.3