aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/src/sgml/Makefile16
-rw-r--r--doc/src/sgml/version.sgml7
-rw-r--r--src/tools/RELEASE_CHANGES1
3 files changed, 11 insertions, 13 deletions
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index e20cdfc177e..b8b0cca7757 100644
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -8,7 +8,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.51 2002/08/05 19:43:30 petere Exp $
+# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.52 2002/10/12 16:34:28 petere Exp $
#
#----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ vpath %.sgml ./ref
ALLBOOKS = admin developer programmer reference tutorial user
-ALLSGML := $(wildcard $(srcdir)/*.sgml $(srcdir)/ref/*.sgml) bookindex.sgml setindex.sgml
+ALLSGML := $(wildcard $(srcdir)/*.sgml $(srcdir)/ref/*.sgml) bookindex.sgml setindex.sgml version.sgml
ifdef DOCBOOKSTYLE
CATALOG = -c $(DOCBOOKSTYLE)/catalog
@@ -119,6 +119,12 @@ setindex.sgml: HTML.index
$(COLLATEINDEX) -i 'setindex' -x -o $@ $<
endif
+version.sgml: $(top_builddir)/src/Makefile.global
+ { \
+ echo "<!entity version \"$(VERSION)\">"; \
+ echo "<!entity majorversion \"`expr $(VERSION) : '\([0-9][0-9]*\.[0-9][0-9]*\)'`\">"; \
+ } >$@
+
##
## Print
@@ -190,8 +196,8 @@ INSTALL HISTORY regress_README: % : %.html
echo "| and put it in place of the existing '$@' file.";\
echo "|"
-INSTALL.html: standalone-install.sgml installation.sgml
- $(JADE.text) -V nochunks $+ >$@
+INSTALL.html: standalone-install.sgml installation.sgml version.sgml
+ $(JADE.text) -V nochunks standalone-install.sgml installation.sgml >$@
HISTORY.html: release.sgml
( echo '<!doctype appendix PUBLIC "-//OASIS//DTD DocBook V3.1//EN">'; \
@@ -233,4 +239,4 @@ clean distclean maintainer-clean:
# print
rm -f *.rtf *.tex-ps *.tex-pdf *.dvi *.aux *.log *.ps *.pdf *.out *.eps *.fot
# index
- rm -f HTML.index bookindex.sgml setindex.sgml
+ rm -f HTML.index bookindex.sgml setindex.sgml version.sgml
diff --git a/doc/src/sgml/version.sgml b/doc/src/sgml/version.sgml
deleted file mode 100644
index 33ff27cd658..00000000000
--- a/doc/src/sgml/version.sgml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!--
-Update this file to propagate correct current version numbers to the
-documentation. In text, use for example &version; to refer to them.
--->
-
-<!entity version "7.3">
-<!entity majorversion "7.3">
diff --git a/src/tools/RELEASE_CHANGES b/src/tools/RELEASE_CHANGES
index d804edf4a08..410d3ed5613 100644
--- a/src/tools/RELEASE_CHANGES
+++ b/src/tools/RELEASE_CHANGES
@@ -1,6 +1,5 @@
* Version numbers
configure.in and configure
- update version and perhaps majorversion in doc/src/sgml/version.sgml
bump interface version numbers
o src/interfaces/libpq/libpq.rc
o src/include/pg_config.h.win32