Re: Rolling v7.2.1 ...

El Mar 26, Peter Eisentraut escribio:

> Marc G. Fournier writes:

> > should there be a step in the 'build dist'
> > that builds the docs based on the sgml?
>
> I've been promoting that every time this problem happens. And the problem
> does happen every time we're making a minor release. I think it's about
> time to clean this up. But it won't happen in the 7.2 branch anymore.

Hello all:

I've been trying to generate HTML from the SGML source here in Mandrake
Linux 8.1, and it needs some patching (Mdk Linux puts collateindex.pl in
/usr/bin rather that $DOCBOOKSTYLE/bin). I posted to pgsql-patches a
one-liner that fixed a small problem, and later a patch to allow
discovery of collateindex.pl, but the moderator apparently didn't bother
to approve the second post. This still needs an autoconf macro to allow
manpage building, 'cause docbook2man-spec.pl lives somewhere else than
the Makefile expects.

(Yes, I know I can set D2MDIR and DOCBOOKINDEX, but I think this is
cleaner)

This is the output of
cvs diff -u config/docbook.m4 src/Makefile.global.in

Index: config/docbook.m4
===================================================================
RCS file: /projects/cvsroot/pgsql/config/docbook.m4,v
retrieving revision 1.1
diff -u -r1.1 docbook.m4
--- config/docbook.m4 2000/11/05 21:04:06 1.1
+++ config/docbook.m4 2002/03/27 02:51:27
@@ -57,7 +57,8 @@
for pgac_postfix in \
sgml/stylesheets/nwalsh-modular \
sgml/stylesheets/docbook \
- sgml/docbook/dsssl/modular
+ sgml/docbook/dsssl/modular \
+ sgml/docbook/dsssl-stylesheets
do
pgac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix
if test -r "$pgac_candidate/html/docbook.dsl" \
@@ -77,3 +78,26 @@
else
AC_MSG_RESULT(no)
fi])# PGAC_PATH_DOCBOOK_STYLESHEETS
+
+# PGAC_PATH_DOCBOOK_COLLATEINDEX
+# ------------------------------
+AC_DEFUN([PGAC_PATH_DOCBOOK_COLLATEINDEX],
+[AC_MSG_CHECKING([for collateindex.pl])
+AC_CACHE_VAL([pgac_cv_path_collateindex],
+[if test -n "$DOCBOOKINDEX"; then
+ pgac_cv_path_collateindex=$DOCBOOKINDEX
+else
+ for pgac_prefix in $DOCBOOKSTYLE/bin /usr/bin; do
+ if test -x "$pgac_prefix/collateindex.pl"; then
+ pgac_cv_path_collateindex=$pgac_prefix/collateindex.pl
+ break
+ fi
+ done
+fi])
+DOCBOOKINDEX=$pgac_cv_path_collateindex
+AC_SUBST([DOCBOOKINDEX])
+if test -n "$DOCBOOKINDEX"; then
+ AC_MSG_RESULT([$DOCBOOKINDEX])
+else
+ AC_MSG_RESULT(no)
+fi])# PGAC_PATH_DOCBOOK_COLLATEINDEX
Index: src/Makefile.global.in
===================================================================
RCS file: /projects/cvsroot/pgsql/src/Makefile.global.in,v
retrieving revision 1.143
diff -u -r1.143 Makefile.global.in
--- src/Makefile.global.in 2002/03/13 00:05:02 1.143
+++ src/Makefile.global.in 2002/03/27 02:51:28
@@ -149,6 +149,7 @@

have_docbook = @have_docbook@
DOCBOOKSTYLE = @DOCBOOKSTYLE@
+DOCBOOKINDEX = @DOCBOOKINDEX@

##########################################################################

--
Alvaro Herrera (<alvherre[a]atentus.com>)
"La primera ley de las demostraciones en vivo es: no trate de usar el sistema.
Escriba un guión que no toque nada para no causar daños." (Jakob Nielsen)