Make some adjustments to the way documentation headers are printed

diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index 24b895f3c397449dc6b94ee67357117090d120bc..22ef50b8997e8ebfd7d67c7c289337a67843b18e 100644 (file)
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -141,7 +141,7 @@ endif
 # changes.
 version.sgml: $(top_srcdir)/configure
        { \
-         echo "<!ENTITY version \"$(VERSION)\">"; \
+         echo "<!ENTITY version \"$(XLVERSION)\">"; \
          echo "<!ENTITY majorversion \"$(MAJORVERSION)\">"; \
        } > $@
 

diff --git a/doc/src/sgml/legal.sgml b/doc/src/sgml/legal.sgml
index 3549d296a1388a31733e52ddc0bdb56d1cf4bcdf..78092caeb37bdc74cba126158e8ce98c3adfc34b 100644 (file)
--- a/doc/src/sgml/legal.sgml
+++ b/doc/src/sgml/legal.sgml
@@ -6,6 +6,10 @@
  <year>1996-2015</year>
  <holder>The PostgreSQL Global Development Group</holder>
 </copyright>
+<copyright>
+ <year>2014-2016</year>
+ <holder>Postgres-XL Development Group</holder>
+</copyright>
 <copyright>
  <year>2009-2012</year>
  <holder>Postgres-XC Development Group</holder>

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 876a896a1a2c5edbb2ae0f2077f3ce55adf671c4..538519fd7d829642649e659687990df842834ff5 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -37,6 +37,7 @@ all:
 
 # PostgreSQL version number
 VERSION = @PACKAGE_VERSION@
+XLVERSION = @PACKAGE_XC_VERSION@
 MAJORVERSION = @PG_MAJORVERSION@
 
 # Support for VPATH builds