From: Steve Singer <ssinger@ca.afilias.info>
Date: Fri, 28 Oct 2011 15:48:17 +0000 (-0400)
Subject: Prefer getting PACKAGE_VERSION from Postgres server
X-Git-Tag: REL_2_2_0_B1~60^2
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=6cdedf5c1c0600b882ff891c8128c95c5e082fd2;p=slony1-engine.git

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 3f82d7d5..19dcab21 100644
--- 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 1b27599e..08ff73e5 100644
--- 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