Generalize Texinfo rules. Prevent them from overriding the PostScript

build rules.

diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index 99167c339b912acae800160273c688871369fe32..58e9a7d049788837e64559acec866c3f200120d4 100644 (file)
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -2,7 +2,7 @@
 #
 # PostgreSQL documentation makefile
 #
-# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.81 2006/12/02 01:26:19 petere Exp $
+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.82 2006/12/10 01:53:15 petere Exp $
 #
 #----------------------------------------------------------------------------
 
@@ -225,6 +225,7 @@ testxml: stylesheet.xsl postgres.xml
 htmlhelp: stylesheet-hh.xsl postgres.xml
        $(XSLTPROC) $(XSLTPROCFLAGS) --stringparam pg.version '$(VERSION)' $^
 
+
 ##
 ## Experimental Texinfo targets
 ##
@@ -233,16 +234,18 @@ DB2X_TEXIXML = db2x_texixml
 DB2X_XSLTPROC = db2x_xsltproc
 MAKEINFO = makeinfo
 
-postgres.texixml: postgres.xml
+%.texixml: %.xml
        $(DB2X_XSLTPROC) -s texi -g output-file=$(basename $@) $< -o $@
 
-postgres.texi: postgres.texixml
-       $(DB2X_TEXIXML) --encoding=iso-8859-1//TRANSLIT $< \
-                       --to-stdout > $@
+%.texi: %.texixml
+       $(DB2X_TEXIXML) --encoding=iso-8859-1//TRANSLIT $< --to-stdout >$@
+
+%.info: %.texi
+       $(MAKEINFO) --enable-encoding --no-split --no-validate $< -o $@
+
+# Cancel built-in suffix rules, interfering with PS building
+.SUFFIXES:
 
-postgres.info: postgres.texi
-       $(MAKEINFO) --enable-encoding --no-split \
-                   --no-validate $< -o $@
 
 ##
 ## Check