--- pgadmin3/pgadmin/Makefile.am.orig	2008-03-18 20:18:08 +0300

+++ pgadmin3/pgadmin/Makefile.am	2008-03-18 20:19:27 +0300

@@ -65,8 +65,8 @@ if !APPBUNDLE

 if BUILD_DEBUG

 nobase_dist_pkgdata_DATA = $(TMP_ui)

 endif

-AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" $(__CXXFLAGS) -I$(top_srcdir)/pgadmin/include $(__EDB_LIBPQ)

-AM_CFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" $(__CFLAGS) -I$(top_srcdir)/pgadmin/include $(__EDB_LIBPQ)

+AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CXXFLAGS) $(__EDB_LIBPQ)

+AM_CFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CFLAGS) $(__EDB_LIBPQ)

 # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy

 # for non-APPBUNDLE cases.

@@ -77,8 +77,8 @@ else

 if BUILD_DEBUG

 nobase_dist_data_DATA = $(TMP_ui)

 endif

-AM_CXXFLAGS = $(__CXXFLAGS) -I$(top_srcdir)/pgadmin/include $(__EDB_LIBPQ)

-AM_CFLAGS = $(__CFLAGS) -I$(top_srcdir)/pgadmin/include $(__EDB_LIBPQ)

+AM_CXXFLAGS = -I$(top_srcdir)/pgadmin/include $(__CXXFLAGS) $(__EDB_LIBPQ)

+AM_CFLAGS = -I$(top_srcdir)/pgadmin/include $(__CFLAGS) $(__EDB_LIBPQ)

 install-exec-hook:

 	cd $(bindir) ;\

--- pgadmin3/acinclude.m4.orig	2008-03-18 20:35:36 +0300

+++ pgadmin3/acinclude.m4	2008-03-18 20:36:09 +0300

@@ -530,7 +530,7 @@ AC_DEFUN([SETUP_POSTGRESQL],

 		AC_LANG_RESTORE

 		PG_INCLUDE=`${PG_CONFIG} --includedir` 

-		CPPFLAGS="$CPPFLAGS -I${PG_INCLUDE}"

+		CPPFLAGS="-I../pgadmin/include $CPPFLAGS -I${PG_INCLUDE}"

 		PG_VERSION=`${PG_CONFIG} --version`