aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2006-12-10 01:53:15 +0000
committerPeter Eisentraut <peter_e@gmx.net>2006-12-10 01:53:15 +0000
commitc605441c791625798fb43b06ebf498fafd3ddba5 (patch)
tree4c780b8699d1f85ed12540f147b3bd4fec1c0ee3
parent0cb91ccba93038c57a7dda6388c9f6bcd5cc52c0 (diff)
downloadpostgresql-c605441c791625798fb43b06ebf498fafd3ddba5.tar.gz
postgresql-c605441c791625798fb43b06ebf498fafd3ddba5.zip
Generalize Texinfo rules. Prevent them from overriding the PostScript
build rules.
-rw-r--r--doc/src/sgml/Makefile19
1 files changed, 11 insertions, 8 deletions
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index 99167c339b9..58e9a7d0497 100644
--- 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