Prefer getting PACKAGE_VERSION from Postgres server

headers rather than Postgres client headers; avoids problem
if libpq happens to be at a higher version than the
Postgres server itself.

Patch-By: Galen Charlton <gmc@esilibrary.com>

diff --git a/Makefile.global.in b/Makefile.global.in
index 3f82d7d58eb9598396ad3e26f7eedded73c013e2..19dcab2122391256c6d1adb46029006d8103d60f 100644 (file)
--- a/Makefile.global.in
+++ b/Makefile.global.in
@@ -79,7 +79,7 @@ PERL=                 @PERL@
 SED=                   @SED@
 subdir=$(slony_subdir)
 
-override CPPFLAGS := -I${pgincludedir} -I${pgincludeserverdir} $(CPPFLAGS)
+override CPPFLAGS := -I${pgincludeserverdir} -I${pgincludedir} $(CPPFLAGS)
 LDFLAGS =   -L${pglibdir} -L${pgpkglibdir} -lpq @NLSLIB@
 
 ifeq ($(GCC), yes)

diff --git a/RELEASE b/RELEASE
index 1b27599ece8eda520d3ff2d7f054c1cea566b854..08ff73e5c1b271e8465ba3c1ee19f7591e7addb9 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -1,6 +1,11 @@
 #+OPTIONS: ^:{}
 * Slony-I Release Notes
 
+** 2.1.1
+
+- Bug #246 :: Include path order changes
+
+** 2.1.0 
 ** 2.1.0 RC 2
 
 - Bug #236 :: Fix default formatting of timestamp in logs